From d001a0482e65d7fbbd963f52b46b5807dd64f633 Mon Sep 17 00:00:00 2001
From: Jordan Reimer <zofskeez@gmail.com>
Date: Thu, 15 Jun 2023 10:20:35 -0600
Subject: [PATCH] Bump HDS to 2.7.0 (#21259)

* bumps hds and flight icon deps to latest

* renames page-header style sheet to fix collision with HDS
---
 ...{page-header.scss => page-header-old.scss} |  0
 ui/app/styles/core.scss                       |  2 +-
 ui/package.json                               |  4 +--
 ui/yarn.lock                                  | 34 +++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename ui/app/styles/components/{page-header.scss => page-header-old.scss} (100%)

diff --git a/ui/app/styles/components/page-header.scss b/ui/app/styles/components/page-header-old.scss
similarity index 100%
rename from ui/app/styles/components/page-header.scss
rename to ui/app/styles/components/page-header-old.scss
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 94fb005d21..4bbbcdd2c5 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -87,7 +87,7 @@
 @import './components/namespace-picker';
 @import './components/namespace-reminder';
 @import './components/navigate-input';
-@import './components/page-header';
+@import './components/page-header-old';
 @import './components/popup-menu';
 @import './components/radio-card';
 @import './components/radial-progress';
diff --git a/ui/package.json b/ui/package.json
index 1126c67f68..168f62fd1c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -60,7 +60,7 @@
     "@ember/test-waiters": "^3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@hashicorp/ember-flight-icons": "^3.0.2",
+    "@hashicorp/ember-flight-icons": "3.0.5",
     "@hashicorp/structure-icons": "^1.3.0",
     "@icholy/duration": "^5.1.0",
     "@tsconfig/ember": "^1.0.1",
@@ -239,7 +239,7 @@
     ]
   },
   "dependencies": {
-    "@hashicorp/design-system-components": "2.3.1",
+    "@hashicorp/design-system-components": "2.7.0",
     "handlebars": "4.7.7",
     "highlight.js": "^10.4.1",
     "node-notifier": "^8.0.1",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index b5e3a4d601..30aab3ee3a 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -4567,13 +4567,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hashicorp/design-system-components@npm:2.3.1":
-  version: 2.3.1
-  resolution: "@hashicorp/design-system-components@npm:2.3.1"
+"@hashicorp/design-system-components@npm:2.7.0":
+  version: 2.7.0
+  resolution: "@hashicorp/design-system-components@npm:2.7.0"
   dependencies:
     "@ember/render-modifiers": ^2.0.5
     "@hashicorp/design-system-tokens": ^1.5.0
-    "@hashicorp/ember-flight-icons": ^3.0.2
+    "@hashicorp/ember-flight-icons": ^3.0.5
     dialog-polyfill: ^0.5.6
     ember-a11y-refocus: ^3.0.2
     ember-auto-import: ^2.6.0
@@ -4590,7 +4590,7 @@ __metadata:
     ember-truth-helpers: ^3.0.0
     sass: ^1.58.3
     tippy.js: ^6.3.7
-  checksum: 07d2ac71f8d345cde731c15ff5ef83a57a2f8ab3b56fd71bec122d50db8a8b10968c4b0344055b6314a85350b6ca1fda6dc290d31da61086c25d6d131dcc7c9b
+  checksum: e100910ffd1b5e5e900c5fccf344b77768b69b847d1e588c23a527fe16134ae9be75c34047a37b3300dc303671675520e3fd4694340f8386bb7ff73129f5ca54
   languageName: node
   linkType: hard
 
@@ -4601,22 +4601,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hashicorp/ember-flight-icons@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@hashicorp/ember-flight-icons@npm:3.0.2"
+"@hashicorp/ember-flight-icons@npm:3.0.5, @hashicorp/ember-flight-icons@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@hashicorp/ember-flight-icons@npm:3.0.5"
   dependencies:
-    "@hashicorp/flight-icons": ^2.12.0
-    ember-auto-import: ^2.4.2
+    "@hashicorp/flight-icons": ^2.13.1
+    ember-auto-import: ^2.6.0
     ember-cli-babel: ^7.26.11
     ember-cli-htmlbars: ^6.1.0
-  checksum: 325982c6d2e05ed73bed183c43eaa5883a60ec02cb055f418adf26e870eaadf763233643b1ec8f2546bb564a8a3b4053ac086c4e24f8924ed94611e3e0519d1b
+  checksum: b18bcd8765e6df59c4bdd6dd584fdaac8f40c7fcd59980092e89a82167178d827895f05867ae6b2005f2513300cff5f6b60b65606567ca8d9c422f18b14bbc79
   languageName: node
   linkType: hard
 
-"@hashicorp/flight-icons@npm:^2.12.0":
-  version: 2.12.0
-  resolution: "@hashicorp/flight-icons@npm:2.12.0"
-  checksum: dbc7316ad69f8209fd196254e2ae7c47984181822e367eaea1301176083240fbbf64a7230adf787b7669d606fe329461e01ca738e514beac9742cb1ba0103f9a
+"@hashicorp/flight-icons@npm:^2.13.1":
+  version: 2.13.1
+  resolution: "@hashicorp/flight-icons@npm:2.13.1"
+  checksum: 590e30e346c9fa0a9bfbe8376300e73c58d0fa95f108c3f67c0795c05576ca39f3beb971bcd20f90f78c7978bfbf2c7d5fc6e5a5dd1efc029e7afdd9f87a3a19
   languageName: node
   linkType: hard
 
@@ -24198,8 +24198,8 @@ __metadata:
     "@ember/test-waiters": ^3.0.0
     "@glimmer/component": ^1.1.2
     "@glimmer/tracking": ^1.1.2
-    "@hashicorp/design-system-components": 2.3.1
-    "@hashicorp/ember-flight-icons": ^3.0.2
+    "@hashicorp/design-system-components": 2.7.0
+    "@hashicorp/ember-flight-icons": 3.0.5
     "@hashicorp/structure-icons": ^1.3.0
     "@icholy/duration": ^5.1.0
     "@tsconfig/ember": ^1.0.1