Merge conflicts

.husky/pre-commit

@@ -1,5 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 yarn compliance:licenses
 npx lint-staged

.husky/prepare-commit-msg

@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 COMMIT_MSG_FILE=$1
 COMMIT_SOURCE=$2
 SHA1=$3

addons/api/package.json

@@ -45,7 +45,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^9.1.0",
     "doctoc": "^2.2.0",
     "ember-cli": "^5.12.0",
     "ember-cli-dependency-checker": "^3.3.2",
@@ -68,8 +68,8 @@
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "prettier": "^3.0.0",
-    "qunit": "^2.19.4",
-    "qunit-dom": "^2.0.0",
+    "qunit": "^2.22.0",
+    "qunit-dom": "^3.2.1",
     "webpack": "^5.94.0"
   },
   "peerDependencies": {

addons/auth/package.json

@@ -21,9 +21,10 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
+    "ember-auto-import": "2.8.1",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.2.0",
-    "ember-simple-auth": "^4.2.2"
+    "ember-simple-auth": "^6.1.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.21.3",
@@ -36,15 +37,14 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^9.1.0",
     "doctoc": "^2.2.0",
-    "ember-auto-import": "^2.8.1",
     "ember-cli": "^5.12.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-cookies": "^0.5.2",
+    "ember-cookies": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
@@ -62,8 +62,8 @@
     "loader.js": "^4.7.0",
     "pretender": "^3.4.3",
     "prettier": "^3.0.0",
-    "qunit": "^2.19.4",
-    "qunit-dom": "^2.0.0",
+    "qunit": "^2.22.0",
+    "qunit-dom": "^3.2.1",
     "webpack": "^5.94.0"
   },
   "engines": {

addons/core/package.json

@@ -57,7 +57,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^9.1.0",
     "doctoc": "^2.2.0",
     "ember-cli": "^5.12.0",
     "ember-cli-dependency-checker": "^3.3.2",
@@ -81,8 +81,8 @@
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "prettier": "^3.0.0",
-    "qunit": "^2.19.4",
-    "qunit-dom": "^2.0.0",
+    "qunit": "^2.22.0",
+    "qunit-dom": "^3.2.1",
     "rose": "*",
     "sinon": "^18.0.0",
     "webpack": "^5.94.0"

addons/core/translations/actions/en-us.yaml

@@ -8,7 +8,6 @@ delete: Delete
 remove: Remove
 discard: Discard
 disconnect: Disconnect
-dismiss: Dismiss
 save: Save
 submit: Submit
 manage: Manage

addons/rose/addon/components/rose/form/index.hbs

@@ -21,7 +21,6 @@
   }}
   {{yield
     (hash
-      radioGroup=(component 'rose/form/radio/group' disabled=this.disabled)
       checkbox=(component 'rose/form/checkbox' disabled=this.disabled)
       checkboxGroup=(component
         'rose/form/checkbox/group' disabled=this.disabled

addons/rose/addon/helpers/map-type-to-color.js

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+export default function mapTypeToColor(flashMsgType) {
+  // Maps the flash message type parameter to the correct hds color.
+  switch (flashMsgType) {
+    case 'error':
+      return 'critical';
+    case 'success':
+      return 'success';
+    case 'warning':
+      return 'warning';
+    default:
+      return 'neutral';
+  }
+}

addons/rose/app/components/rose/form/radio/card.js → addons/rose/app/helpers/map-type-to-color.js

@@ -3,4 +3,4 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-export { default } from 'rose/components/rose/form/radio/card';
+export { default } from 'rose/helpers/map-type-to-color';

addons/rose/app/styles/rose/components/_index.scss

@@ -12,7 +12,6 @@
 @import 'layout';
 @import 'icon';
 @import 'list';
-@import 'notification';
 @import 'card';
 @import 'cards';
 @import 'page-header';