diff --git a/.changelog/25353.txt b/.changelog/25353.txt new file mode 100644 index 000000000..707732a4a --- /dev/null +++ b/.changelog/25353.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Updated icons to the newest design system +``` diff --git a/ui/app/components/allocation-service-sidebar.hbs b/ui/app/components/allocation-service-sidebar.hbs index 62d915290..bcaad8a55 100644 --- a/ui/app/components/allocation-service-sidebar.hbs +++ b/ui/app/components/allocation-service-sidebar.hbs @@ -38,7 +38,7 @@ type="button" {{on "click" @fns.closeSidebar}} > - {{x-icon "cancel"}} + diff --git a/ui/app/components/chart-primitives/v-annotations.hbs b/ui/app/components/chart-primitives/v-annotations.hbs index 4ebab9910..07565dbff 100644 --- a/ui/app/components/chart-primitives/v-annotations.hbs +++ b/ui/app/components/chart-primitives/v-annotations.hbs @@ -11,7 +11,7 @@ title={{annotation.label}} class="indicator {{if annotation.isActive "is-active"}}" {{on "click" (fn this.selectAnnotation annotation.annotation)}}> - {{x-icon annotation.icon}} +
diff --git a/ui/app/components/chart-primitives/v-annotations.js b/ui/app/components/chart-primitives/v-annotations.js index 5452e95f7..e598dbe7a 100644 --- a/ui/app/components/chart-primitives/v-annotations.js +++ b/ui/app/components/chart-primitives/v-annotations.js @@ -9,8 +9,8 @@ import { action, get } from '@ember/object'; import styleString from 'nomad-ui/utils/properties/glimmer-style-string'; const iconFor = { - error: 'cancel-circle-fill', - info: 'info-circle-fill', + error: 'x-circle-fill', + info: 'info-fill', }; const iconClassFor = { diff --git a/ui/app/components/child-job-row.hbs b/ui/app/components/child-job-row.hbs index b97f4eae5..d87fb19f9 100644 --- a/ui/app/components/child-job-row.hbs +++ b/ui/app/components/child-job-row.hbs @@ -19,7 +19,7 @@ {{#if @job.isPack}} - {{x-icon "box" class= "test"}} + Pack {{/if}} diff --git a/ui/app/components/das/accepted.hbs b/ui/app/components/das/accepted.hbs index 3a460a292..fcabdcc65 100644 --- a/ui/app/components/das/accepted.hbs +++ b/ui/app/components/das/accepted.hbs @@ -8,5 +8,5 @@

Recommendation accepted

A new version of this job will now be deployed.

- {{x-icon "check-circle-fill"}} - \ No newline at end of file + + diff --git a/ui/app/components/das/error.hbs b/ui/app/components/das/error.hbs index 3671c8f56..48ba14e7a 100644 --- a/ui/app/components/das/error.hbs +++ b/ui/app/components/das/error.hbs @@ -14,7 +14,7 @@ 
{{@error}}
- {{x-icon "alert-circle-fill"}} +
- \ No newline at end of file + diff --git a/ui/app/components/das/recommendation-accordion.hbs b/ui/app/components/das/recommendation-accordion.hbs index e471e7531..5716415aa 100644 --- a/ui/app/components/das/recommendation-accordion.hbs +++ b/ui/app/components/das/recommendation-accordion.hbs @@ -24,7 +24,7 @@ {{else}}
- {{x-icon "info-circle-fill"}} + Resource Recommendation {{@summary.taskGroup.name}}
@@ -49,4 +49,4 @@ {{/if}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ui/app/components/das/recommendation-chart.hbs b/ui/app/components/das/recommendation-chart.hbs index 63bf3b323..c50ba5271 100644 --- a/ui/app/components/das/recommendation-chart.hbs +++ b/ui/app/components/das/recommendation-chart.hbs @@ -24,7 +24,7 @@ width={{this.icon.width}} height={{this.icon.height}} > - {{x-icon this.icon.name}} + - \ No newline at end of file + diff --git a/ui/app/components/evaluation-sidebar/detail.hbs b/ui/app/components/evaluation-sidebar/detail.hbs index ad12d7bb6..1245c802e 100644 --- a/ui/app/components/evaluation-sidebar/detail.hbs +++ b/ui/app/components/evaluation-sidebar/detail.hbs @@ -33,7 +33,7 @@ type="button" {{on "click" this.closeSidebar}} > - {{x-icon "cancel"}} +
@@ -62,7 +62,7 @@ type="button" {{on "click" this.closeSidebar}} > - {{x-icon "cancel"}} +
{{! Start Evaluation Stats}} @@ -173,4 +173,4 @@ {{/if}} -{{/let}} \ No newline at end of file +{{/let}} diff --git a/ui/app/components/job-status/deployment-history.hbs b/ui/app/components/job-status/deployment-history.hbs index 16b9617d1..4b8cd5789 100644 --- a/ui/app/components/job-status/deployment-history.hbs +++ b/ui/app/components/job-status/deployment-history.hbs @@ -13,9 +13,9 @@ > {{or @title "Deployment History"}} {{#if this.isHidden}} - {{x-icon "chevron-down"}} + {{else}} - {{x-icon "chevron-up"}} + {{/if}} diff --git a/ui/app/components/keyboard-shortcuts-modal.hbs b/ui/app/components/keyboard-shortcuts-modal.hbs index 46c5c61be..8f98f7a9f 100644 --- a/ui/app/components/keyboard-shortcuts-modal.hbs +++ b/ui/app/components/keyboard-shortcuts-modal.hbs @@ -18,7 +18,7 @@ {{on "click" (toggle "keyboard.shortcutsVisible" this)}} aria-label="Dismiss" > - {{x-icon "cancel"}} +

Keyboard Shortcuts

Click a key pattern to re-bind it to a shortcut of your choosing.

diff --git a/ui/app/components/task-context-sidebar.hbs b/ui/app/components/task-context-sidebar.hbs index 12758b274..cdbde6235 100644 --- a/ui/app/components/task-context-sidebar.hbs +++ b/ui/app/components/task-context-sidebar.hbs @@ -33,7 +33,7 @@ type="button" {{on "click" @fns.closeSidebar}} > - {{x-icon "cancel"}} + {{#if @task.events.length}} @@ -99,7 +99,7 @@ {{else}} {{keyboard-commands (array this.widenCommand)}} {{/if}} - {{x-icon (if this.wide "arrow-right" "arrow-left")}} + - \ No newline at end of file + diff --git a/ui/app/components/task-sub-row.hbs b/ui/app/components/task-sub-row.hbs index 6428371c3..855b511b3 100644 --- a/ui/app/components/task-sub-row.hbs +++ b/ui/app/components/task-sub-row.hbs @@ -27,7 +27,7 @@ role="tooltip" aria-label="Couldn't collect stats" > - {{x-icon "alert-triangle" class="is-warning"}} + {{else}}
- {{x-icon "alert-triangle" class="is-warning"}} + {{else}}
- {{x-icon this.model.compositeStatusIcon}} +
@@ -263,7 +263,7 @@ Drivers {{#if this.model.unhealthyDrivers.length}} - {{x-icon "alert-triangle" class="is-text is-warning"}} + {{this.model.unhealthyDrivers.length}} of {{this.model.detectedDrivers.length}} @@ -341,7 +341,7 @@ Force Drain {{#if this.model.drainStrategy.isForced}} - {{x-icon "alert-triangle" class="is-text is-warning"}}Yes + Yes {{else}} No {{/if}} diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs index cb30abbd9..d82ce0cb9 100644 --- a/ui/app/templates/clients/index.hbs +++ b/ui/app/templates/clients/index.hbs @@ -252,10 +252,12 @@ of {{this.sortedNodes.length}}
- {{x-icon - "chevron-left" - }} - {{x-icon "chevron-right"}} + + + + + +
    diff --git a/ui/app/templates/components/agent-monitor.hbs b/ui/app/templates/components/agent-monitor.hbs index 3a0fc55e1..95f2a80d4 100644 --- a/ui/app/templates/components/agent-monitor.hbs +++ b/ui/app/templates/components/agent-monitor.hbs @@ -16,7 +16,7 @@ Level: {{capitalize level}}
    diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs index de925249d..9a8bd599b 100644 --- a/ui/app/templates/components/allocation-row.hbs +++ b/ui/app/templates/components/allocation-row.hbs @@ -11,7 +11,7 @@ role="tooltip" aria-label="Allocation depends on unhealthy drivers" > - {{x-icon "alert-triangle" class="is-warning"}} + {{/if}} {{#if this.allocation.nextAllocation}} @@ -21,7 +21,7 @@ role="tooltip" aria-label="Allocation was rescheduled" > - {{x-icon "history" class="is-faded"}} + {{/if}} {{#if this.allocation.wasPreempted}} @@ -31,7 +31,7 @@ role="tooltip" aria-label="Allocation was preempted" > - {{x-icon "boot" class="is-faded"}} + {{/if}} diff --git a/ui/app/templates/components/allocation-stat.hbs b/ui/app/templates/components/allocation-stat.hbs index 8f8a91646..f0f01aa1b 100644 --- a/ui/app/templates/components/allocation-stat.hbs +++ b/ui/app/templates/components/allocation-stat.hbs @@ -8,7 +8,7 @@ … {{else if this.error}} - {{x-icon "alert-triangle" class="is-warning"}} + {{else}} @@ -92,7 +92,7 @@ class="tooltip multiline" aria-label="Immediately remove allocations from the client." > - {{x-icon "info-circle-outline" class="is-faded"}} +
    @@ -109,7 +109,7 @@ class="tooltip multiline" aria-label="Stop allocations for system jobs." > - {{x-icon "info-circle-outline" class="is-faded"}} + diff --git a/ui/app/templates/components/exec/task-contents.hbs b/ui/app/templates/components/exec/task-contents.hbs index 4b2f4c841..7bbb6b67f 100644 --- a/ui/app/templates/components/exec/task-contents.hbs +++ b/ui/app/templates/components/exec/task-contents.hbs @@ -5,17 +5,15 @@
    -
    {{this.task.name}}
    - {{#if this.active}} - - - - {{/if}} +
    + {{#if this.active}} + + {{/if}} + {{this.task.name}} +
    {{#if this.shouldOpenInNewWindow}} - {{x-icon "exit" class="show-on-hover"}} + -{{else}} - {{x-icon "exit"}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ui/app/templates/components/exec/task-group-parent.hbs b/ui/app/templates/components/exec/task-group-parent.hbs index a749767ca..4df0fa4c4 100644 --- a/ui/app/templates/components/exec/task-group-parent.hbs +++ b/ui/app/templates/components/exec/task-group-parent.hbs @@ -4,7 +4,7 @@ ~}} {{#if this.isOpen}} @@ -27,4 +27,4 @@ {{/if}} {{/each}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ui/app/templates/components/fs/directory-entry.hbs b/ui/app/templates/components/fs/directory-entry.hbs index 0ecd8269d..d7e79f0f7 100644 --- a/ui/app/templates/components/fs/directory-entry.hbs +++ b/ui/app/templates/components/fs/directory-entry.hbs @@ -7,9 +7,9 @@ {{#if this.entry.IsDir}} - {{x-icon "folder-outline"}} + {{else}} - {{x-icon "file-outline"}} + {{/if}} {{this.entry.Name}} diff --git a/ui/app/templates/components/fs/file.hbs b/ui/app/templates/components/fs/file.hbs index 54bc8bdf6..5725b6931 100644 --- a/ui/app/templates/components/fs/file.hbs +++ b/ui/app/templates/components/fs/file.hbs @@ -22,7 +22,7 @@ {{/if}} {{#if this.isStreamable}} {{/if}} diff --git a/ui/app/templates/components/global-search/trigger.hbs b/ui/app/templates/components/global-search/trigger.hbs index 4d3b395c2..ba345f2f5 100644 --- a/ui/app/templates/components/global-search/trigger.hbs +++ b/ui/app/templates/components/global-search/trigger.hbs @@ -3,10 +3,10 @@ SPDX-License-Identifier: BUSL-1.1 ~}} -{{x-icon "search" class="is-small"}} + {{#unless this.select.isOpen}} Jump to {{/unless}} {{#if (not (or this.select.isActive this.select.isOpen))}} / -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ui/app/templates/components/job-page/parts/children.hbs b/ui/app/templates/components/job-page/parts/children.hbs index de9ab0e07..4df38a115 100644 --- a/ui/app/templates/components/job-page/parts/children.hbs +++ b/ui/app/templates/components/job-page/parts/children.hbs @@ -73,10 +73,10 @@ {{this.sortedChildren.length}} - {{x-icon "chevron-left"}} + - {{x-icon "chevron-right"}} +
      @@ -92,4 +92,4 @@

      {{/if}} - \ No newline at end of file + diff --git a/ui/app/templates/components/job-page/parts/summary-legend-item.hbs b/ui/app/templates/components/job-page/parts/summary-legend-item.hbs index fbccd9212..aae4fe26f 100644 --- a/ui/app/templates/components/job-page/parts/summary-legend-item.hbs +++ b/ui/app/templates/components/job-page/parts/summary-legend-item.hbs @@ -17,7 +17,7 @@ {{#if @datum.help}} - {{x-icon "info-circle-outline" class="is-faded"}} + {{/if}} - \ No newline at end of file + diff --git a/ui/app/templates/components/job-page/parts/title.hbs b/ui/app/templates/components/job-page/parts/title.hbs index 2b008ad9b..f9d4042f4 100644 --- a/ui/app/templates/components/job-page/parts/title.hbs +++ b/ui/app/templates/components/job-page/parts/title.hbs @@ -8,7 +8,7 @@ {{or this.title this.job.name}} {{#if @job.meta.structured.root.children.pack}} - {{x-icon "box" class= "test"}} + Pack {{/if}} diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs index 3f062378b..62bd14bd1 100644 --- a/ui/app/templates/components/job-row.hbs +++ b/ui/app/templates/components/job-row.hbs @@ -2,7 +2,7 @@ Copyright (c) HashiCorp, Inc. SPDX-License-Identifier: BUSL-1.1 ~}} - +{{!-- TODO: is not currently used in the UI. It should be re-implemented in jobs/index.hbs --}} - {{x-icon "box" class= "test"}} Pack {{/if}} @@ -70,4 +69,4 @@ /> {{/if}} - \ No newline at end of file + diff --git a/ui/app/templates/components/loading-spinner.hbs b/ui/app/templates/components/loading-spinner.hbs index 6c874557f..cecd2ce65 100644 --- a/ui/app/templates/components/loading-spinner.hbs +++ b/ui/app/templates/components/loading-spinner.hbs @@ -12,7 +12,7 @@
      - {{x-icon "nomad-logo-n"}} +
      diff --git a/ui/app/templates/components/plugin-allocation-row.hbs b/ui/app/templates/components/plugin-allocation-row.hbs index 071615bfc..adf8a01c8 100644 --- a/ui/app/templates/components/plugin-allocation-row.hbs +++ b/ui/app/templates/components/plugin-allocation-row.hbs @@ -7,17 +7,17 @@ {{#if this.allocation.unhealthyDrivers.length}} - {{x-icon "alert-triangle" class="is-warning"}} + {{/if}} {{#if this.allocation.nextAllocation}} - {{x-icon "history" class="is-faded"}} + {{/if}} {{#if this.allocation.wasPreempted}} - {{x-icon "boot" class="is-faded"}} + {{/if}} @@ -42,9 +42,7 @@ - {{x-icon - (if this.pluginAllocation.healthy "check-circle-outline" "minus-circle-outline") - class=(if this.pluginAllocation.healthy "is-success" "is-danger")}} + {{if this.pluginAllocation.healthy "Healthy" "Unhealthy"}} diff --git a/ui/app/templates/components/popover-menu.hbs b/ui/app/templates/components/popover-menu.hbs index 60d04588d..2b49d99a9 100644 --- a/ui/app/templates/components/popover-menu.hbs +++ b/ui/app/templates/components/popover-menu.hbs @@ -23,7 +23,7 @@ {{on "keyup" (action "openOnArrowDown" dd)}} > {{this.label}} - {{x-icon "chevron-down" class="is-text"}} + {{yield dd}} diff --git a/ui/app/templates/components/reschedule-event-timeline.hbs b/ui/app/templates/components/reschedule-event-timeline.hbs index 8ee28e42c..b57ed5044 100644 --- a/ui/app/templates/components/reschedule-event-timeline.hbs +++ b/ui/app/templates/components/reschedule-event-timeline.hbs @@ -12,12 +12,12 @@ {{/if}} {{#if @allocation.hasStoppedRescheduling}}
    • - {{x-icon "alert-triangle" class="is-warning is-text"}} Nomad has stopped attempting to reschedule this allocation. + Nomad has stopped attempting to reschedule this allocation.
      • {{/if}} {{#if (and @allocation.followUpEvaluation.waitUntil (not @allocation.nextAllocation))}}
    • - {{x-icon "clock" class="is-info is-text"}} Nomad will attempt to reschedule + Nomad will attempt to reschedule {{moment-from-now @allocation.followUpEvaluation.waitUntil interval=1000}} diff --git a/ui/app/templates/components/scale-events-accordion.hbs b/ui/app/templates/components/scale-events-accordion.hbs index f85571a85..8a16a30b6 100644 --- a/ui/app/templates/components/scale-events-accordion.hbs +++ b/ui/app/templates/components/scale-events-accordion.hbs @@ -18,7 +18,7 @@ data-test-error={{a.item.error}} > {{#if a.item.error}} - {{x-icon "cancel-circle-fill" class="is-danger"}} + {{/if}} @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/ui/app/templates/components/scale-events-chart.hbs b/ui/app/templates/components/scale-events-chart.hbs index ddf0ce30b..802293600 100644 --- a/ui/app/templates/components/scale-events-chart.hbs +++ b/ui/app/templates/components/scale-events-chart.hbs @@ -32,9 +32,9 @@
      {{#if this.activeEvent.event.error}} - {{x-icon "cancel-circle-fill" class="is-danger"}} + {{else}} - {{x-icon "info-circle-fill" class="is-grey"}} + {{/if}}
      diff --git a/ui/app/templates/components/search-box.hbs b/ui/app/templates/components/search-box.hbs index d848b8d61..cc52e6267 100644 --- a/ui/app/templates/components/search-box.hbs +++ b/ui/app/templates/components/search-box.hbs @@ -4,7 +4,7 @@ ~}}
      - {{x-icon "search"}} + - +
      diff --git a/ui/app/templates/components/stepper-input.hbs b/ui/app/templates/components/stepper-input.hbs index c7cdb4a02..afd15c4da 100644 --- a/ui/app/templates/components/stepper-input.hbs +++ b/ui/app/templates/components/stepper-input.hbs @@ -30,7 +30,7 @@ onclick={{action "decrement"}} type="button" > - {{x-icon "minus-plain"}} + diff --git a/ui/app/templates/components/task-group-row.hbs b/ui/app/templates/components/task-group-row.hbs index e03b5a1b8..b056caa4d 100644 --- a/ui/app/templates/components/task-group-row.hbs +++ b/ui/app/templates/components/task-group-row.hbs @@ -23,7 +23,7 @@ disabled={{or this.isMinimum this.runningDeployment (cannot "scale job" namespace=this.namespace)}} onclick={{action "countDown"}} type="button"> - {{x-icon "minus-plain" class="is-text"}} +
      {{/if}} diff --git a/ui/app/templates/components/task-log.hbs b/ui/app/templates/components/task-log.hbs index 76103a5ca..8e7a2a02e 100644 --- a/ui/app/templates/components/task-log.hbs +++ b/ui/app/templates/components/task-log.hbs @@ -48,7 +48,7 @@
      diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs index 78d863b23..cf6ec7141 100644 --- a/ui/app/templates/components/task-row.hbs +++ b/ui/app/templates/components/task-row.hbs @@ -6,7 +6,7 @@ {{#unless this.task.driverStatus.healthy}} - + {{/unless}} @@ -79,7 +79,7 @@ role="tooltip" aria-label="Couldn't collect stats" > - {{x-icon "alert-triangle" class="is-warning"}} +       {{else}}
      - {{x-icon "alert-triangle" class="is-warning"}} + {{else}}
      - {{x-icon "refresh-default" class="is-text"}} + Refresh
      @@ -200,4 +200,4 @@ handleEvaluationClick=this.handleEvaluationClick }} /> - \ No newline at end of file + diff --git a/ui/app/templates/exec-loading.hbs b/ui/app/templates/exec-loading.hbs index 852bd4f1a..819931b5c 100644 --- a/ui/app/templates/exec-loading.hbs +++ b/ui/app/templates/exec-loading.hbs @@ -13,10 +13,10 @@
      Documentation - {{x-icon "lock-closed"}} +
      -
      \ No newline at end of file + diff --git a/ui/app/templates/exec.hbs b/ui/app/templates/exec.hbs index 31ad2e7fb..8ce82bb4d 100644 --- a/ui/app/templates/exec.hbs +++ b/ui/app/templates/exec.hbs @@ -30,7 +30,7 @@
      Documentation - {{x-icon "lock-closed"}} +
      @@ -60,4 +60,4 @@ -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs index 2fea518b8..3478b7b12 100644 --- a/ui/app/templates/jobs/index.hbs +++ b/ui/app/templates/jobs/index.hbs @@ -159,7 +159,7 @@ {{B.data.name}} {{#if B.data.isPack}} - {{x-icon "box" class= "test"}} + Pack {{/if}} diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs index 4b85aee57..f8d7e8f99 100644 --- a/ui/app/templates/jobs/job/task-group.hbs +++ b/ui/app/templates/jobs/job/task-group.hbs @@ -247,10 +247,10 @@ {{this.sortedAllocations.length}} - {{x-icon "chevron-left"}} + - {{x-icon "chevron-right"}} +
        diff --git a/ui/app/templates/storage/plugins/index.hbs b/ui/app/templates/storage/plugins/index.hbs index 545e91dbb..fb8a71f07 100644 --- a/ui/app/templates/storage/plugins/index.hbs +++ b/ui/app/templates/storage/plugins/index.hbs @@ -73,8 +73,12 @@
        {{p.startsAt}}–{{p.endsAt}} of {{this.sortedPlugins.length}}
        - {{x-icon "chevron-left"}} - {{x-icon "chevron-right"}} + + + + + +
          diff --git a/ui/app/templates/storage/plugins/plugin/allocations.hbs b/ui/app/templates/storage/plugins/plugin/allocations.hbs index 71ed9878d..9d1514eac 100644 --- a/ui/app/templates/storage/plugins/plugin/allocations.hbs +++ b/ui/app/templates/storage/plugins/plugin/allocations.hbs @@ -62,8 +62,12 @@
          {{p.startsAt}}–{{p.endsAt}} of {{this.sortedAllocations.length}}
          - {{x-icon "chevron-left"}} - {{x-icon "chevron-right"}} + + + + + +
            diff --git a/ui/config/environment.js b/ui/config/environment.js index 4e7053986..45e94ffbf 100644 --- a/ui/config/environment.js +++ b/ui/config/environment.js @@ -33,7 +33,9 @@ module.exports = function (environment) { Date: false, }, }, - + emberFlightIcons: { + lazyEmbed: true, + }, APP: { blockingQueries: true, mirageScenario: 'smallCluster', diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index d0b8e81f6..b49edd2aa 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -12,15 +12,6 @@ const isTest = environment === 'test'; module.exports = function (defaults) { let app = new EmberApp(defaults, { - svg: { - paths: [ - 'node_modules/@hashicorp/structure-icons/dist', - 'public/images/icons', - ], - optimize: { - plugins: [{ removeViewBox: false }], - }, - }, codemirror: { modes: ['javascript', 'ruby'], }, diff --git a/ui/package.json b/ui/package.json index 5d96de015..7f18db2cd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -47,7 +47,6 @@ "@ember/test-helpers": "^3.0.3", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "@hashicorp/structure-icons": "^1.3.0", "anser": "^2.1.1", "babel-eslint": "^10.1.0", "base64-js": "^1.3.1", @@ -95,7 +94,6 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.1.1", "ember-inflector": "^4.0.2", - "ember-inline-svg": "^1.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "3.2.7", diff --git a/ui/public/images/icons/boot.svg b/ui/public/images/icons/boot.svg deleted file mode 100644 index 116bd0245..000000000 --- a/ui/public/images/icons/boot.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/public/images/icons/box.svg b/ui/public/images/icons/box.svg deleted file mode 100644 index bf341f81c..000000000 --- a/ui/public/images/icons/box.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ui/public/images/icons/cancel.svg b/ui/public/images/icons/cancel.svg deleted file mode 100644 index 5821f87e4..000000000 --- a/ui/public/images/icons/cancel.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ui/public/images/icons/clock.svg b/ui/public/images/icons/clock.svg deleted file mode 100644 index d7f8a6dd4..000000000 --- a/ui/public/images/icons/clock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/public/images/icons/console.svg b/ui/public/images/icons/console.svg deleted file mode 100644 index 1b8477441..000000000 --- a/ui/public/images/icons/console.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/public/images/icons/history.svg b/ui/public/images/icons/history.svg deleted file mode 100644 index 714265f25..000000000 --- a/ui/public/images/icons/history.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/public/images/icons/media-pause.svg b/ui/public/images/icons/media-pause.svg deleted file mode 100644 index 126ab6c07..000000000 --- a/ui/public/images/icons/media-pause.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/public/images/icons/media-play.svg b/ui/public/images/icons/media-play.svg deleted file mode 100644 index 3b3ba714a..000000000 --- a/ui/public/images/icons/media-play.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/public/images/icons/node-init-circle-fill.svg b/ui/public/images/icons/node-init-circle-fill.svg deleted file mode 100644 index 775a63f20..000000000 --- a/ui/public/images/icons/node-init-circle-fill.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ui/public/images/icons/nomad-logo-n.svg b/ui/public/images/icons/nomad-logo-n.svg deleted file mode 100644 index 7c5a408e2..000000000 --- a/ui/public/images/icons/nomad-logo-n.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/ui/public/images/icons/search.svg b/ui/public/images/icons/search.svg deleted file mode 100644 index aa64d5e73..000000000 --- a/ui/public/images/icons/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ui/tests/integration/components/copy-button-test.js b/ui/tests/integration/components/copy-button-test.js index 16c96c675..c0f146412 100644 --- a/ui/tests/integration/components/copy-button-test.js +++ b/ui/tests/integration/components/copy-button-test.js @@ -23,8 +23,7 @@ module('Integration | Component | copy-button', function (hooks) { assert.expect(2); await render(hbs``); - - assert.dom('.copy-button .icon-is-copy-action').exists(); + assert.dom('.copy-button .hds-icon-clipboard-copy').exists(); await componentA11yAudit(this.element, assert); }); @@ -44,7 +43,7 @@ module('Integration | Component | copy-button', function (hooks) { clock.runAll(); assert.dom('[data-test-copy-success]').doesNotExist(); - assert.dom('.copy-button .icon-is-copy-action').exists(); + assert.dom('.copy-button .hds-icon-clipboard-copy').exists(); clock.restore(); }); @@ -57,7 +56,7 @@ module('Integration | Component | copy-button', function (hooks) { await click('.copy-button button'); await triggerCopyError('.copy-button button'); - assert.dom('.copy-button .icon-is-alert-triangle').exists(); + assert.dom('.copy-button .hds-icon-clipboard-x').exists(); await componentA11yAudit(this.element, assert); }); }); diff --git a/ui/tests/integration/components/das/recommendation-chart-test.js b/ui/tests/integration/components/das/recommendation-chart-test.js index ad5316d89..3dea05479 100644 --- a/ui/tests/integration/components/das/recommendation-chart-test.js +++ b/ui/tests/integration/components/das/recommendation-chart-test.js @@ -31,7 +31,7 @@ module('Integration | Component | das/recommendation-chart', function (hooks) { assert.dom('.recommendation-chart.increase').exists(); assert.dom('.recommendation-chart .resource').hasText('CPU'); - assert.dom('.recommendation-chart .icon-is-arrow-up').exists(); + assert.dom('.recommendation-chart .hds-icon-arrow-up').exists(); assert.dom('text.percent').hasText('+46%'); await componentA11yAudit(this.element, assert); }); @@ -55,7 +55,7 @@ module('Integration | Component | das/recommendation-chart', function (hooks) { assert.dom('.recommendation-chart.decrease').exists(); assert.dom('.recommendation-chart .resource').hasText('Mem'); - assert.dom('.recommendation-chart .icon-is-arrow-down').exists(); + assert.dom('.recommendation-chart .hds-icon-arrow-down').exists(); assert.dom('text.percent').hasText('−32%'); await componentA11yAudit(this.element, assert); }); @@ -106,7 +106,7 @@ module('Integration | Component | das/recommendation-chart', function (hooks) { assert.dom('.recommendation-chart rect.delta').doesNotExist(); assert.dom('.recommendation-chart .changes').doesNotExist(); assert.dom('.recommendation-chart .resource').hasText('CPU'); - assert.dom('.recommendation-chart .icon-is-arrow-up').exists(); + assert.dom('.recommendation-chart .hds-icon-arrow-up').exists(); await componentA11yAudit(this.element, assert); }); diff --git a/ui/tests/pages/allocations/fs.js b/ui/tests/pages/allocations/fs.js index 79cdddf4d..21abbe10d 100644 --- a/ui/tests/pages/allocations/fs.js +++ b/ui/tests/pages/allocations/fs.js @@ -45,8 +45,8 @@ export default create({ directoryEntries: collection('[data-test-entry]', { name: text('[data-test-name]'), - isFile: isPresent('.icon-is-file-outline'), - isDirectory: isPresent('.icon-is-folder-outline'), + isFile: isPresent('.hds-icon-file'), + isDirectory: isPresent('.hds-icon-folder'), size: text('[data-test-size]'), lastModified: text('[data-test-last-modified]'), diff --git a/ui/tests/pages/components/popover-menu.js b/ui/tests/pages/components/popover-menu.js index c8874a781..be89a46da 100644 --- a/ui/tests/pages/components/popover-menu.js +++ b/ui/tests/pages/components/popover-menu.js @@ -20,7 +20,7 @@ export default (scope) => ({ isPresent: isPresent(), label: text('[data-test-popover-trigger]'), - labelHasIcon: isPresent('[data-test-popover-trigger] svg.icon'), + labelHasIcon: isPresent('[data-test-popover-trigger] .hds-icon'), toggle: clickable('[data-test-popover-trigger]'), focus: focusable('[data-test-popover-trigger]'), diff --git a/ui/tests/pages/exec.js b/ui/tests/pages/exec.js index d1b102727..9b7b7b35b 100644 --- a/ui/tests/pages/exec.js +++ b/ui/tests/pages/exec.js @@ -32,14 +32,14 @@ export default create({ isLoading: hasClass('is-loading', '[data-test-task-group-name]'), chevron: { - scope: '.toggle-button .icon', - isDown: hasClass('icon-is-chevron-down'), - isRight: hasClass('icon-is-chevron-right'), + scope: '.toggle-button .hds-icon', + isDown: hasClass('hds-icon-chevron-down'), + isRight: hasClass('hds-icon-chevron-right'), }, tasks: collection('[data-test-task]', { name: text(), - isActive: isPresent('[data-test-task-active]'), + isActive: isPresent('.active-identifier'), }), }), diff --git a/ui/yarn.lock b/ui/yarn.lock index 60ce4faf2..e82119442 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2594,11 +2594,6 @@ resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.7.0.tgz#cc8e4fb7cc8ac585a4841f6d724217a054cfe959" integrity sha512-oSnIjGqzXciibyQjgc45u4GUHBrIgyFSBCjxP4t0WXbJ578J3/DB6eyvWoMJ4r4GSf0MxUgOg0A/fJV/V4yEdA== -"@hashicorp/structure-icons@^1.3.0": - version "1.9.2" - resolved "https://registry.yarnpkg.com/@hashicorp/structure-icons/-/structure-icons-1.9.2.tgz#c75f955b2eec414ecb92f3926c79b4ca01731d3c" - integrity sha512-AffJv0V9npr1EWlM1XrpaKPG9PzddV48OE+jspqy7aRoFZB5++oNnPx4MZQKmFInOljnzNwfktVRkJiQHy7haw== - "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -3080,11 +3075,6 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== -"@types/q@^1.5.1": - version "1.5.8" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.8.tgz#95f6c6a08f2ad868ba230ead1d2d7f7be3db3837" - integrity sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw== - "@types/qs@*": version "6.9.15" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" @@ -3602,19 +3592,6 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.reduce@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz#6aadc2f995af29cb887eb866d981dc85ab6f7dc7" - integrity sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q== - dependencies: - call-bind "^1.0.7" - define-properties "^1.2.1" - es-abstract "^1.23.2" - es-array-method-boxes-properly "^1.0.0" - es-errors "^1.3.0" - es-object-atoms "^1.0.0" - is-string "^1.0.7" - arraybuffer.prototype.slice@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" @@ -4538,11 +4515,6 @@ body@^5.1.0: raw-body "~1.1.0" safe-json-parse "~1.0.1" -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== - bower-config@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae" @@ -4797,14 +4769,6 @@ broccoli-filter@^1.2.2, broccoli-filter@^1.2.3: symlink-or-copy "^1.0.1" walk-sync "^0.3.1" -broccoli-flatiron@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/broccoli-flatiron/-/broccoli-flatiron-0.1.3.tgz#fc7bd8faf7db429ed7199933aa2ec7ef84a8d943" - integrity sha512-dD/4ck+LKOLTBzFlxP2zX7fhWt1TFMVR/88b9/wd8LkAHUyAzWs1vBah94ObSvajYGZ7ic+XvMXw+OhmvdlYoQ== - dependencies: - broccoli-plugin "^1.3.0" - mkdirp "^0.5.1" - broccoli-funnel-reducer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea" @@ -4829,7 +4793,7 @@ broccoli-funnel@2.0.1: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2, broccoli-funnel@~2.0.2: +broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75" integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ== @@ -4885,7 +4849,7 @@ broccoli-merge-trees@^2.0.0: broccoli-plugin "^1.3.0" merge-trees "^1.0.1" -broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2, broccoli-merge-trees@~3.0.2: +broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d" integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A== @@ -5590,15 +5554,6 @@ clone@^2.0.0, clone@^2.1.2: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - 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" @@ -5947,37 +5902,6 @@ css-loader@^5.2.0: schema-utils "^3.0.0" semver "^7.3.5" -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" - integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== - dependencies: - boolbase "^1.0.0" - css-what "^3.2.1" - domutils "^1.7.0" - nth-check "^1.0.2" - -css-tree@1.0.0-alpha.28: - version "1.0.0-alpha.28" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f" - integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha.29: - version "1.0.0-alpha.29" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" - integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - css-tree@^2.0.4: version "2.3.1" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" @@ -5986,28 +5910,11 @@ css-tree@^2.0.4: mdn-data "2.0.30" source-map-js "^1.0.1" -css-url-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec" - integrity sha512-hLKuvifwoKvwqpctblTp0BovBuOXzxof8JgkA8zeqxxL+vcynHQjtIqqlFfQI1gEAZAjbqKm9gFTa88fxTAX4g== - -css-what@^3.2.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" - integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== - cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -csso@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b" - integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg== - dependencies: - css-tree "1.0.0-alpha.29" - cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" @@ -6402,7 +6309,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4: es-errors "^1.3.0" gopd "^1.0.1" -define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: +define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -6521,24 +6428,6 @@ dom-element-descriptors@^0.5.0: resolved "https://registry.yarnpkg.com/dom-element-descriptors/-/dom-element-descriptors-0.5.1.tgz#3ebfcf64198f922dba928f84f7970bb571891317" integrity sha512-DLayMRQ+yJaziF4JJX1FMjwjdr7wdTr1y9XvZ+NfHELfOMcYDnCHneAYXAS4FT1gLILh4V0juMZohhH1N5FsoQ== -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -domelementtype@1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -6551,14 +6440,6 @@ dompurify@^3.1.3: resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.5.tgz#2c6a113fc728682a0f55684b1388c58ddb79dc38" integrity sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA== -domutils@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -6763,7 +6644,7 @@ 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, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: version "7.26.11" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f" integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA== @@ -6889,7 +6770,7 @@ ember-cli-get-component-path-option@^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" integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA== -ember-cli-htmlbars@^4.0.0, ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.3.1: +ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.3.1: version "4.5.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e" integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw== @@ -7537,23 +7418,6 @@ ember-inflector@^3.0.1: dependencies: ember-cli-babel "^6.6.0" -ember-inline-svg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ember-inline-svg/-/ember-inline-svg-1.0.1.tgz#fa1e8ef56823274680d363b21fb1127a95ae98a3" - integrity sha512-dRf6zRpFunXms8ba095vT4pppTItwYZGy9fjpd9zq5Eqx+97bukv+NffM+shtah1WHrMLj/j8XnxEalENAOiag== - dependencies: - broccoli-caching-writer "^3.0.3" - broccoli-flatiron "~0.1.3" - broccoli-funnel "~2.0.2" - broccoli-merge-trees "~3.0.2" - ember-cli-babel "^7.11.1" - ember-cli-htmlbars "^4.0.0" - merge "^2.1.1" - mkdirp "^0.5.1" - promise-map-series "^0.2.1" - svgo "~1.2.2" - walk-sync "~2.0.2" - ember-lifeline@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/ember-lifeline/-/ember-lifeline-7.0.0.tgz#46780c8f832b6c784ee4681b938a1e1437bfa676" @@ -8036,7 +7900,7 @@ errorhandler@^1.5.1: accepts "~1.3.7" escape-html "~1.0.3" -es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2: +es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2: version "1.23.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== @@ -8088,11 +7952,6 @@ es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23 unbox-primitive "^1.0.2" which-typed-array "^1.1.15" -es-array-method-boxes-properly@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" - integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== - es-define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" @@ -9442,7 +9301,7 @@ has-proto@^1.0.1, has-proto@^1.0.3: resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== -has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: +has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== @@ -10954,11 +10813,6 @@ mdn-data@2.0.30: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== -mdn-data@~1.1.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" - integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA== - mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -11016,11 +10870,6 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -merge@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" - integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w== - methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -11156,7 +11005,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -11435,13 +11284,6 @@ npmlog@^6.0.0: gauge "^4.0.3" set-blocking "^2.0.0" -nth-check@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -11498,19 +11340,6 @@ object.assign@^4.1.5: has-symbols "^1.0.3" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.1.0: - version "2.1.8" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923" - integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A== - dependencies: - array.prototype.reduce "^1.0.6" - call-bind "^1.0.7" - define-properties "^1.2.1" - es-abstract "^1.23.2" - es-object-atoms "^1.0.0" - gopd "^1.0.1" - safe-array-concat "^1.1.2" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -11518,15 +11347,6 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" - integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== - dependencies: - call-bind "^1.0.7" - define-properties "^1.2.1" - es-object-atoms "^1.0.0" - on-finished@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -12111,11 +11931,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== - qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" @@ -12747,11 +12562,6 @@ sass@^1.17.3, sass@^1.69.5: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -sax@~1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -13121,7 +12931,7 @@ source-map@0.4.x, source-map@^0.4.2: dependencies: amdefine ">=0.0.4" -source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== @@ -13211,11 +13021,6 @@ sri-toolbox@^0.2.0: resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e" integrity sha512-DQIMWCAr/M7phwo+d3bEfXwSBEwuaJL+SJx9cuqt1Ty7K96ZFoHpYnSbhrQZEr0+0/GtmpKECP8X/R4RyeTAfw== -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - stagehand@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.1.tgz#0cbca6f906e4a7be36c5830dc31d9cc7091a827e" @@ -13470,26 +13275,6 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svgo@~1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316" - integrity sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.28" - css-url-regex "^1.1.0" - csso "^3.5.1" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" - stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -14065,11 +13850,6 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg== - unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -14136,16 +13916,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 sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -util.promisify@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -14248,15 +14018,6 @@ walk-sync@^3.0.0: matcher-collection "^2.0.1" 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.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"