From 1ec2b0f39c7b286506c74f22780416da4bf4cd83 Mon Sep 17 00:00:00 2001 From: Zack Moore Date: Wed, 30 Oct 2024 14:17:07 +0000 Subject: [PATCH] backport of commit 00b88bda741a384e47e8303335380846cd194e4c --- ui/app/components/actions-flyout.hbs | 2 +- .../components/allocation-service-sidebar.hbs | 10 +- .../job-status/allocation-status-block.hbs | 6 +- .../components/job-status/failed-or-lost.hbs | 4 +- .../job-status/individual-allocation.hbs | 6 +- .../job-status/latest-deployment.hbs | 2 +- .../components/job-status/panel/deploying.hbs | 6 +- ui/app/components/task-sub-row.hbs | 2 +- ui/app/components/variable-paths.hbs | 4 +- ui/app/styles/components/actions.scss | 10 +- .../styles/components/job-status-panel.scss | 2 +- .../administration/policies/policy.hbs | 2 +- .../templates/administration/roles/role.hbs | 2 +- .../allocations/allocation/index.hbs | 6 +- ui/app/templates/clients/client/index.hbs | 4 +- .../templates/components/job-service-row.hbs | 6 +- .../components/scale-events-accordion.hbs | 4 +- ui/app/templates/components/task-row.hbs | 2 +- ui/app/templates/components/topo-viz/node.hbs | 4 +- ui/app/templates/jobs/index.hbs | 8 +- .../templates/jobs/job/services/service.hbs | 2 +- ui/app/templates/variables/variable/index.hbs | 5 +- ui/ember-cli-build.js | 1 - ui/package.json | 3 +- ui/tests/acceptance/variables-test.js | 4 +- ui/tests/pages/clients/list.js | 2 +- ui/tests/pages/components/topo-viz/node.js | 2 +- ui/yarn.lock | 96 +++++++++---------- 28 files changed, 102 insertions(+), 105 deletions(-) diff --git a/ui/app/components/actions-flyout.hbs b/ui/app/components/actions-flyout.hbs index fccf16f91fc..f945999202c 100644 --- a/ui/app/components/actions-flyout.hbs +++ b/ui/app/components/actions-flyout.hbs @@ -33,7 +33,7 @@ - + diff --git a/ui/app/components/allocation-service-sidebar.hbs b/ui/app/components/allocation-service-sidebar.hbs index 7ad7ab4485a..62d9152907c 100644 --- a/ui/app/components/allocation-service-sidebar.hbs +++ b/ui/app/components/allocation-service-sidebar.hbs @@ -18,15 +18,15 @@ {{#if (not-eq @service.provider "consul")}} {{#if (eq this.aggregateStatus 'Unhealthy')}} - + Unhealthy {{else if (eq this.aggregateStatus 'Unknown')}} - + Health Unknown {{else}} - + Healthy {{/if}} @@ -133,10 +133,10 @@ {{#if (eq row.model.Status "success")}} - + Healthy {{else if (eq row.model.Status "failure")}} - + Unhealthy {{else if (eq row.model.Status "pending")}} Pending diff --git a/ui/app/components/job-status/allocation-status-block.hbs b/ui/app/components/job-status/allocation-status-block.hbs index 7bafb99fd29..4365627715c 100644 --- a/ui/app/components/job-status/allocation-status-block.hbs +++ b/ui/app/components/job-status/allocation-status-block.hbs @@ -45,11 +45,11 @@ {{#if (eq @status "running")}} {{#if (eq @health "healthy")}} - + {{else if (eq @health "unhealthy")}} - + {{else}} - + {{/if}} {{/if}} diff --git a/ui/app/components/job-status/failed-or-lost.hbs b/ui/app/components/job-status/failed-or-lost.hbs index 433bd186baa..8613eace12e 100644 --- a/ui/app/components/job-status/failed-or-lost.hbs +++ b/ui/app/components/job-status/failed-or-lost.hbs @@ -9,7 +9,7 @@ {{#if @supportsRescheduling}} - + - + {{#if (eq @health "healthy")}} - + {{else if (eq @health "unhealthy")}} - + {{else}} - + {{/if}} {{/if}} diff --git a/ui/app/components/job-status/latest-deployment.hbs b/ui/app/components/job-status/latest-deployment.hbs index 01a3763ba64..80d60888d9a 100644 --- a/ui/app/components/job-status/latest-deployment.hbs +++ b/ui/app/components/job-status/latest-deployment.hbs @@ -7,7 +7,7 @@

Latest Deployment - +

diff --git a/ui/app/components/job-status/panel/deploying.hbs b/ui/app/components/job-status/panel/deploying.hbs index a511cac74af..59354b6b440 100644 --- a/ui/app/components/job-status/panel/deploying.hbs +++ b/ui/app/components/job-status/panel/deploying.hbs @@ -140,11 +140,11 @@ {{#if (eq health "healthy")}} - + {{else if (eq health "unhealthy")}} - + {{else}} - + {{/if}} diff --git a/ui/app/components/task-sub-row.hbs b/ui/app/components/task-sub-row.hbs index a4cdf58c500..6428371c382 100644 --- a/ui/app/components/task-sub-row.hbs +++ b/ui/app/components/task-sub-row.hbs @@ -13,7 +13,7 @@
{{this.task.name}}
diff --git a/ui/app/components/variable-paths.hbs b/ui/app/components/variable-paths.hbs index 4b00fc46f43..ea6cc09a7c8 100644 --- a/ui/app/components/variable-paths.hbs +++ b/ui/app/components/variable-paths.hbs @@ -27,7 +27,7 @@ }} > - + {{trim-path folder.name}} @@ -48,7 +48,7 @@ }} > - + {{#if (can "read variable" path=file.absoluteFilePath namespace=file.variable.namespace)}} .hds-flyout__header { + & .hds-flyout__header { position: relative; z-index: $z-base; - .hds-flyout__title { + + .hds-flyout__title .hds-text { display: flex; align-items: center; gap: 1rem; justify-content: space-between; + h3 { flex-grow: 1; } } + + .hds-dismiss-button { + align-self: center; + } } .hds-application-state { diff --git a/ui/app/styles/components/job-status-panel.scss b/ui/app/styles/components/job-status-panel.scss index 917277ad595..cd5742df734 100644 --- a/ui/app/styles/components/job-status-panel.scss +++ b/ui/app/styles/components/job-status-panel.scss @@ -423,7 +423,7 @@ } } - .legend-item .represented-allocation .flight-icon { + .legend-item .represented-allocation .hds-icon { animation: none; } diff --git a/ui/app/templates/administration/policies/policy.hbs b/ui/app/templates/administration/policies/policy.hbs index 365e90c69ca..45a8d065e9a 100644 --- a/ui/app/templates/administration/policies/policy.hbs +++ b/ui/app/templates/administration/policies/policy.hbs @@ -58,7 +58,7 @@

Create Tokens from the Nomad CLI

-

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: +

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: 

                 {{this.newTokenString}}
                 Create Tokens from the Nomad CLI
-

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: +

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: 

                 {{this.newTokenString}}
                 
               
                 {{#if (eq row.model.provider "nomad")}}
-                  
+                  
                 {{else}}
-                  
+                  
                   {{#if row.model.connect}}
-                    
+                    
                   {{/if}}
                 {{/if}}
               
diff --git a/ui/app/templates/clients/client/index.hbs b/ui/app/templates/clients/client/index.hbs
index bea905f4e52..47d29e7b9bb 100644
--- a/ui/app/templates/clients/client/index.hbs
+++ b/ui/app/templates/clients/client/index.hbs
@@ -186,7 +186,7 @@
           aria-label="More information"
           class="is-faded"
         >
-          
+          
         
         
-        
+
diff --git a/ui/app/templates/components/job-service-row.hbs b/ui/app/templates/components/job-service-row.hbs index 57c034eb940..7160e453fd5 100644 --- a/ui/app/templates/components/job-service-row.hbs +++ b/ui/app/templates/components/job-service-row.hbs @@ -19,10 +19,10 @@ }} > {{#if (eq @service.provider "nomad")}} - + {{@service.name}} {{else}} - + {{#if (and (eq @service.provider "consul") this.consulRedirectLink)}} {{@service.name}} @@ -31,7 +31,7 @@ {{@service.name}} {{/if}} {{#if @service.connect}} - + {{/if}} {{/if}} diff --git a/ui/app/templates/components/scale-events-accordion.hbs b/ui/app/templates/components/scale-events-accordion.hbs index 6a5f8e1e27d..f85571a8549 100644 --- a/ui/app/templates/components/scale-events-accordion.hbs +++ b/ui/app/templates/components/scale-events-accordion.hbs @@ -33,9 +33,9 @@ to {{a.item.count}}" aria-label="More information"> {{#if a.item.increased}} - + {{else}} - + {{/if}} diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs index bd811f1c753..838297a68e4 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}} diff --git a/ui/app/templates/components/topo-viz/node.hbs b/ui/app/templates/components/topo-viz/node.hbs index c411df1bd54..b4fa1b81aca 100644 --- a/ui/app/templates/components/topo-viz/node.hbs +++ b/ui/app/templates/components/topo-viz/node.hbs @@ -12,7 +12,7 @@ @text="Client is draining" aria-label="Client is draining" > - + {{else if (not @node.node.isEligible)}} - + {{/if}} {{@node.node.name}} diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs index 21a6db3e43d..2fea518b84c 100644 --- a/ui/app/templates/jobs/index.hbs +++ b/ui/app/templates/jobs/index.hbs @@ -342,7 +342,7 @@ /> {{/if}} - + - @@ -362,8 +362,8 @@ - - + {{/if}} diff --git a/ui/app/templates/jobs/job/services/service.hbs b/ui/app/templates/jobs/job/services/service.hbs index 70f5fe7c330..9d39473f294 100644 --- a/ui/app/templates/jobs/job/services/service.hbs +++ b/ui/app/templates/jobs/job/services/service.hbs @@ -6,7 +6,7 @@

- + {{this.model.name}}

diff --git a/ui/app/templates/variables/variable/index.hbs b/ui/app/templates/variables/variable/index.hbs index d14e16eef52..00d4c4cbddd 100644 --- a/ui/app/templates/variables/variable/index.hbs +++ b/ui/app/templates/variables/variable/index.hbs @@ -125,10 +125,7 @@ }} > - + {{#if B.data.isVisible}} diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index 364c8fbc27f..d0b8e81f64c 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -40,7 +40,6 @@ module.exports = function (defaults) { precision: 4, includePaths: [ './node_modules/@hashicorp/design-system-tokens/dist/products/css', - './node_modules/@hashicorp/ember-flight-icons/dist/styles', './node_modules/@hashicorp/design-system-components/dist/styles', ], }, diff --git a/ui/package.json b/ui/package.json index 0c75d86e05c..147c368b240 100644 --- a/ui/package.json +++ b/ui/package.json @@ -167,8 +167,7 @@ }, "dependencies": { "@babel/helper-string-parser": "^7.19.4", - "@hashicorp/design-system-components": "^4.3.0", - "@hashicorp/ember-flight-icons": "^5.0.2", + "@hashicorp/design-system-components": "^4.13.0", "@percy/cli": "^1.30.0", "@percy/ember": "^4.2.0", "curved-arrows": "^0.1.0", diff --git a/ui/tests/acceptance/variables-test.js b/ui/tests/acceptance/variables-test.js index f66cd8784ea..d425ef2e4a1 100644 --- a/ui/tests/acceptance/variables-test.js +++ b/ui/tests/acceptance/variables-test.js @@ -410,9 +410,7 @@ module('Acceptance | variables', function (hooks) { await typeIn('[data-test-path-input]', 'foo/bar'); await clickToggle('[data-test-variable-namespace-filter]'); assert - .dom( - '[data-test-variable-namespace-filter] .hds-menu-primitive__content' - ) + .dom('[data-test-variable-namespace-filter] .hds-dropdown__content') .exists('Namespace can be edited.'); assert .dom('[data-test-variable-namespace-filter]') diff --git a/ui/tests/pages/clients/list.js b/ui/tests/pages/clients/list.js index 13e567e7908..8d59790fcfa 100644 --- a/ui/tests/pages/clients/list.js +++ b/ui/tests/pages/clients/list.js @@ -22,7 +22,7 @@ const heliosFacet = (scope) => ({ scope, toggle: clickable('button'), options: collection( - '.hds-menu-primitive__content .hds-dropdown__content .hds-dropdown__list .hds-dropdown-list-item--variant-checkbox', + '.hds-dropdown__content .hds-dropdown__list .hds-dropdown-list-item--variant-checkbox', { toggle: clickable('label'), count: text('label .hds-dropdown-list-item__count'), diff --git a/ui/tests/pages/components/topo-viz/node.js b/ui/tests/pages/components/topo-viz/node.js index 2910bac3ae6..a59549b6070 100644 --- a/ui/tests/pages/components/topo-viz/node.js +++ b/ui/tests/pages/components/topo-viz/node.js @@ -31,7 +31,7 @@ export default (scope) => ({ label: text('[data-test-label]'), labelIsPresent: isPresent('[data-test-label]'), - statusIcon: attribute('class', '[data-test-status-icon] .flight-icon'), + statusIcon: attribute('class', '[data-test-status-icon] .hds-icon'), statusIconLabel: attribute('aria-label', '[data-test-status-icon]'), selectNode: clickable('[data-test-node-background]'), diff --git a/ui/yarn.lock b/ui/yarn.lock index dae76cfeb3d..8930c2a8c51 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2556,53 +2556,43 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== -"@hashicorp/design-system-components@^4.3.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.4.0.tgz#c633ec2df53a9e9a303e63182566c0266e326aa6" - integrity sha512-87K3/TQvyVeA68olUh66TjaGL1x9QJM9G0nJW053/+zemFnud2je6/+BdO/uc5iJtDnGNSahWy71TDObYsN3pg== +"@hashicorp/design-system-components@^4.13.0": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.13.1.tgz#18a12eb23e52a7676613f6bf39e4defdfd73182a" + integrity sha512-yEiQJxAs0zgt/dxM6ZYPcVJT0a3C2wrO+8iOxUd623jyDXlbyjD/vZSp7qOCvkomQkHvWgD/7clVdl75a5i3rQ== dependencies: "@ember/render-modifiers" "^2.0.5" "@ember/string" "^3.1.1" "@ember/test-waiters" "^3.1.0" "@embroider/addon-shim" "^1.8.7" "@floating-ui/dom" "^1.6.3" - "@hashicorp/design-system-tokens" "^2.1.0" - "@hashicorp/ember-flight-icons" "^5.0.2" - "@oddbird/popover-polyfill" "^0.4.3" + "@hashicorp/design-system-tokens" "^2.2.1" + "@hashicorp/flight-icons" "^3.7.0" decorator-transforms "^1.1.0" - ember-a11y-refocus "^3.0.2" + ember-a11y-refocus "^4.1.3" ember-cli-sass "^11.0.1" ember-composable-helpers "^5.0.0" ember-element-helper "^0.8.5" ember-focus-trap "^1.1.0" - ember-keyboard "^8.2.1" + ember-get-config "^2.1.1" ember-modifier "^4.1.0" ember-power-select "^8.2.0" ember-stargate "^0.4.3" - ember-style-modifier "^3.0.1" + ember-style-modifier "^4.4.0" ember-truth-helpers "^4.0.3" prismjs "^1.29.0" sass "^1.69.5" tippy.js "^6.3.7" -"@hashicorp/design-system-tokens@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.1.0.tgz#e72284f375631f624ff2f3198dc6d2ee03e0d422" - integrity sha512-8SFUmRsX9v9pCc1Oq+zZGAmZGLxdZ6WnVEvwOzPAswlUTxBPa5zdoKdKEOPw8Xr3j142Mie6WVk2SMTV9EjQIQ== - -"@hashicorp/ember-flight-icons@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-5.0.2.tgz#e2f4d1d1fadd9364a0db2dd2e2da5b9595e5a159" - integrity sha512-jb9h7fe9KNyPq1rPnLN6C/+7ldsFPiRmTe16KWyteJ+1dPmBLOUKl/Fr95L+u3Zh3DzzchZVcSdwia0U03I3EQ== - dependencies: - "@embroider/addon-shim" "^1.8.7" - "@hashicorp/flight-icons" "^3.2.0" - ember-get-config "^2.1.1" +"@hashicorp/design-system-tokens@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.2.1.tgz#9112c4cf9099ef1706a6b4f83be400960b473e91" + integrity sha512-Pnbnk5jbOXmW82W0wimP0PdOWYAi7dYsC3TE88JbR+jHzpwUdyVGsqcYF7ClOl/C/KDbK60N0FEJbFdaFj6ZXQ== -"@hashicorp/flight-icons@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.2.0.tgz#048d5d32d99bb5d5f7e2f76298adaadf82598405" - integrity sha512-blvRLVlWRldiOZao0CuiGxgZ4rCSPNkK5SrcnSbja+bOoTsPyD2bcLTpwtCHVYa+G9MS4bFtolrMhTLKjMSsCQ== +"@hashicorp/flight-icons@^3.7.0": + version "3.7.0" + 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" @@ -2689,11 +2679,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oddbird/popover-polyfill@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@oddbird/popover-polyfill/-/popover-polyfill-0.4.3.tgz#310d61c8fc7ee12d8dba05cdfa8bd7e5d5a281a3" - integrity sha512-kBS0ZAwH8kZqFl0mV89KPK4cLYl2ZoKSfYngK4dz1eLAhKzTK0yu4LrvLdMeM7JhjWK6GxBtiY+cl1s6vR2pUg== - "@percy/cli-app@1.30.0": version "1.30.0" resolved "https://registry.yarnpkg.com/@percy/cli-app/-/cli-app-1.30.0.tgz#d9b0058514766bcfd0c36887c062a2824f0362f9" @@ -6051,6 +6036,11 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +csstype@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + curved-arrows@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/curved-arrows/-/curved-arrows-0.1.0.tgz#824709316a856e28970c1f577803093a57475bb0" @@ -6394,6 +6384,14 @@ decorator-transforms@^1.1.0: "@babel/plugin-syntax-decorators" "^7.23.3" babel-import-util "^2.0.1" +decorator-transforms@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/decorator-transforms/-/decorator-transforms-2.2.2.tgz#c163e86815c78152528a8c1549e95d8f3403e61b" + integrity sha512-NHCSJXOUQ29YFli1QzstXWo72EyASpoVx+s0YdkMwswpovf/iAJP580nD1tB0Ph9exvtbfWdVrSAloXrWVo1Xg== + dependencies: + "@babel/plugin-syntax-decorators" "^7.23.3" + babel-import-util "^3.0.0" + deep-is@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -6620,10 +6618,10 @@ electron-to-chromium@^1.5.4: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.26.tgz#449b4fa90e83ab98abbe3b6a96c8ee395de94452" integrity sha512-Z+OMe9M/V6Ep9n/52+b7lkvYEps26z4Yz3vjWL1V61W0q+VLF1pOHhMY17sa4roz4AWmULSI8E6SAojZA5L0YQ== -ember-a11y-refocus@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-3.0.2.tgz#e648c491d3a8d84cb594679bafc8430cd22b2ed4" - integrity sha512-5T9kAvl0RUBF6SSeaaWpVS2WC8MTktgqiGdLAbxVjT2f2NGrDDPmv7riDVNMsuL5sHRwSKm0EHCIzZ4M3aFMow== +ember-a11y-refocus@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-4.1.4.tgz#ffcabbc91503379cd2c0124cb5f0bc93178098b5" + integrity sha512-51tGk30bskObL1LsGZRxzqIxgZhIE8ZvvDYcT1OWphxZlq00+Arz57aMLS4Vz4qhSE40BfeN2qFYP/gXtp9qDA== dependencies: ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.0.1" @@ -7441,7 +7439,7 @@ ember-decorators@^6.1.1: "@ember-decorators/object" "^6.1.1" ember-cli-babel "^7.7.3" -ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3: +ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1" integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw== @@ -7567,16 +7565,6 @@ ember-inline-svg@^1.0.1: svgo "~1.2.2" walk-sync "~2.0.2" -ember-keyboard@^8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ember-keyboard/-/ember-keyboard-8.2.1.tgz#945a8a71068d81c06ad26851008ef81061db2a59" - integrity sha512-wT9xpt3GKsiodGZoifKU4OyeRjXWlmKV9ZHHsp6wJBwMFpl4wWPjTNdINxivk2qg/WFNIh8nUiwuG4+soWXPdw== - dependencies: - "@embroider/addon-shim" "^1.8.4" - ember-destroyable-polyfill "^2.0.3" - ember-modifier "^2.1.2 || ^3.1.0 || ^4.0.0" - ember-modifier-manager-polyfill "^1.2.0" - ember-lifeline@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/ember-lifeline/-/ember-lifeline-7.0.0.tgz#46780c8f832b6c784ee4681b938a1e1437bfa676" @@ -7631,7 +7619,7 @@ ember-modifier@3.2.7, ember-modifier@^3.2.0, ember-modifier@^3.2.7: ember-cli-typescript "^5.0.0" ember-compatibility-helpers "^1.2.5" -"ember-modifier@^2.1.2 || ^3.1.0 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.1.0", ember-modifier@^4.1.0: +"ember-modifier@^3.2.7 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.1.0", ember-modifier@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.1.0.tgz#cb91efbf8ca4ff4a1a859767afa42dddba5a2bbd" integrity sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ== @@ -7849,7 +7837,7 @@ ember-statecharts@^0.13.2: ember-usable "https://github.com/pzuraq/ember-usable#0d03a50" xstate "^4.12.0" -"ember-style-modifier@^0.8.0 || ^1.0.0 || ^2.0.0 || ^3.0.0", ember-style-modifier@^3.0.1: +"ember-style-modifier@^0.8.0 || ^1.0.0 || ^2.0.0 || ^3.0.0": version "3.1.1" resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-3.1.1.tgz#313269708552c42255806586160411840adc98c5" integrity sha512-J91YLKVp3/m7LrcLEWNSG2sJlSFhE5Ny75empU048qYJtdJMe788Ks/EpKEi953o1mJujVRg792YGrwbrpTzNA== @@ -7858,6 +7846,16 @@ ember-statecharts@^0.13.2: ember-cli-babel "^7.26.11" ember-modifier "^3.2.7 || ^4.0.0" +ember-style-modifier@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-4.4.0.tgz#2d1fa6a35d41d88612277d7d149f1e569acaf8d3" + integrity sha512-gT1ckbhl1KSj5sWTo/8UChj98eZeE+mUmYoXw8VjwJgWP0wiTCibGZjVbC0WlIUd7umxuG61OQ/ivfF+sAiOEQ== + dependencies: + "@embroider/addon-shim" "^1.8.7" + csstype "^3.1.3" + decorator-transforms "^2.0.0" + ember-modifier "^3.2.7 || ^4.0.0" + ember-template-lint@^3.15.0: version "3.16.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.16.0.tgz#7af2ec8d4386f4726be08c14c39ba121c56f0896"