From 8814e2eacbe47a1acb96fb42104a194407b092d6 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Thu, 17 Apr 2025 13:59:14 -0700
Subject: [PATCH] Ember upgrade for addons/core (#2777)

---
 addons/core/.ember-cli                        |  8 ---
 addons/core/.eslintignore                     | 13 +---
 addons/core/.npmignore                        |  8 +--
 addons/core/.prettierignore                   | 14 +----
 addons/core/.template-lintrc.js               |  3 +
 addons/core/.watchmanconfig                   |  2 +-
 addons/core/CONTRIBUTING.md                   | 24 ++++----
 addons/core/README.md                         |  3 +
 .../core/addon/components/doc-link/index.hbs  |  2 +-
 addons/core/package.json                      | 44 ++++++-------
 .../tests/dummy/config/ember-cli-update.json  |  2 +-
 addons/core/tests/dummy/config/ember-try.js   |  8 +--
 addons/core/tests/helpers/index.js            |  2 +-
 ui/desktop/.gitignore                         |  7 ---
 yarn.lock                                     | 61 ++++++++++++-------
 15 files changed, 93 insertions(+), 108 deletions(-)

diff --git a/addons/core/.ember-cli b/addons/core/.ember-cli
index 8c1812cff..465c4050d 100644
--- a/addons/core/.ember-cli
+++ b/addons/core/.ember-cli
@@ -1,12 +1,4 @@
 {
-  /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
-  */
-  "disableAnalytics": false,
-
   /**
     Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
     rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
diff --git a/addons/core/.eslintignore b/addons/core/.eslintignore
index d474a40bd..768fab33b 100644
--- a/addons/core/.eslintignore
+++ b/addons/core/.eslintignore
@@ -1,25 +1,14 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
+/declarations/
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
diff --git a/addons/core/.npmignore b/addons/core/.npmignore
index 38a2b0863..071798902 100644
--- a/addons/core/.npmignore
+++ b/addons/core/.npmignore
@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -21,18 +17,18 @@
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
+/tsconfig.declarations.json
+/tsconfig.json
 /yarn-error.log
 /yarn.lock
 .gitkeep
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
diff --git a/addons/core/.prettierignore b/addons/core/.prettierignore
index 4178fd571..9385391f2 100644
--- a/addons/core/.prettierignore
+++ b/addons/core/.prettierignore
@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
-.eslintcache
-.lint-todo/
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
diff --git a/addons/core/.template-lintrc.js b/addons/core/.template-lintrc.js
index 1d70e56bd..4d5c2e8e0 100644
--- a/addons/core/.template-lintrc.js
+++ b/addons/core/.template-lintrc.js
@@ -12,5 +12,8 @@ module.exports = {
     'no-curly-component-invocation': {
       allow: ['app-name', 'company-name', 'company-copyright'],
     },
+    'no-implicit-this': {
+      allow: ['app-name', 'company-name', 'company-copyright'],
+    },
   },
 };
diff --git a/addons/core/.watchmanconfig b/addons/core/.watchmanconfig
index e7834e3e4..f9c3d8f84 100644
--- a/addons/core/.watchmanconfig
+++ b/addons/core/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/addons/core/CONTRIBUTING.md b/addons/core/CONTRIBUTING.md
index 7491f6c86..c1992162d 100644
--- a/addons/core/CONTRIBUTING.md
+++ b/addons/core/CONTRIBUTING.md
@@ -2,25 +2,27 @@
 
 ## Installation
 
-* `git clone <repository-url>`
-* `cd core`
-* `yarn install`
+- `git clone <repository-url>`
+- `cd core`
+- `yarn install`
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js --fix`
+- `yarn lint:hbs`
+- `yarn lint:js`
+- `yarn lint:js --fix`
+- `yarn lint`
+- `yarn lint:fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+- `yarn test` – Runs the test suite on the current Ember version
+- `yarn test:ember --server` – Runs the test suite in "watch mode"
+- `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `yarn start`
+- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/addons/core/README.md b/addons/core/README.md
index 6d7aab5fa..829db93dd 100644
--- a/addons/core/README.md
+++ b/addons/core/README.md
@@ -30,6 +30,7 @@ helpers.
 Add this addon to an Ember application's `devDependencies` as:
 `"core": "workspace:*"`, for applications included in this monorepo.
 
+
 ## Installation
 
 See monorepo README for installation instructions.
@@ -180,10 +181,12 @@ Before submitting your work, be sure to run auto-formatters
 * `yarn start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
+
 ## Contributing
 
 See monorepo README for more contribution instructions.
 
+
 ### Building ToC
 
 To autogenerate a ToC (table of contents) for this README,
diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs
index 504188f67..8ea58edae 100644
--- a/addons/core/addon/components/doc-link/index.hbs
+++ b/addons/core/addon/components/doc-link/index.hbs
@@ -5,7 +5,7 @@
 
 <a
   class='doc-link'
-  href={{(doc-url @doc)}}
+  href={{doc-url @doc}}
   target='_blank'
   rel='noreferrer noopener'
   title={{t 'actions.get-topic-help'}}
diff --git a/addons/core/package.json b/addons/core/package.json
index e9bd6aa34..ef62a569c 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -15,8 +15,8 @@
   "scripts": {
     "build:development": "ember build",
     "build": "ember build --environment=production",
-    "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
-    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
+    "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
+    "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint .",
@@ -31,13 +31,14 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
+    "@babel/core": "^7.26.10",
     "@formatjs/intl-durationformat": "^0.2.4",
     "api": "workspace:*",
     "auth": "workspace:*",
     "ember-auto-import": "^2.10.0",
     "ember-browser-services": "^4.0.3",
     "ember-cli-babel": "^8.2.0",
-    "ember-cli-htmlbars": "^6.2.0",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-sass": "^11.0.1",
     "ember-concurrency": "^4.0.3",
     "ember-feature-flags": "^6.0.0",
@@ -49,46 +50,45 @@
     "sass": "^1.69.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/eslint-parser": "^7.21.3",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^4.0.5",
-    "@embroider/test-setup": "^2.1.1",
+    "@babel/eslint-parser": "^7.25.1",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.1",
+    "@embroider/test-setup": "^4.0.0",
     "@faker-js/faker": "^8.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.1.0",
     "doctoc": "^2.2.0",
-    "ember-cli": "^5.12.0",
+    "ember-cli": "~5.12.0",
+    "ember-cli-clean-css": "^3.0.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-inline-svg": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^7.0.0",
+    "ember-page-title": "^8.2.3",
     "ember-qunit": "^8.1.0",
-    "ember-resolver": "^10.0.0",
-    "ember-source": "~4.12.0",
+    "ember-resolver": "^12.0.1",
+    "ember-source": "~5.12.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.7.2",
+    "ember-template-lint": "^6.0.0",
     "ember-template-lint-plugin-prettier": "^5.0.0",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-ember": "^11.11.1",
-    "eslint-plugin-n": "^16.3.1",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.2.1",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-qunit": "^8.1.2",
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.3.3",
     "qunit": "^2.22.0",
     "qunit-dom": "^3.2.1",
     "rose": "workspace:*",
     "sinon": "^19.0.2",
-    "webpack": "^5.94.0"
+    "webpack": "^5.95.0"
   },
   "engines": {
     "node": "20.* || 22.*"
diff --git a/addons/core/tests/dummy/config/ember-cli-update.json b/addons/core/tests/dummy/config/ember-cli-update.json
index 939aa56e6..7265445c0 100644
--- a/addons/core/tests/dummy/config/ember-cli-update.json
+++ b/addons/core/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.12.2",
+      "version": "5.12.0",
       "blueprints": [
         {
           "name": "addon",
diff --git a/addons/core/tests/dummy/config/ember-try.js b/addons/core/tests/dummy/config/ember-try.js
index dcd02153e..a500b131b 100644
--- a/addons/core/tests/dummy/config/ember-try.js
+++ b/addons/core/tests/dummy/config/ember-try.js
@@ -12,18 +12,18 @@ module.exports = async function () {
   return {
     scenarios: [
       {
-        name: 'ember-lts-4.4',
+        name: 'ember-lts-4.12',
         npm: {
           devDependencies: {
-            'ember-source': '~4.4.0',
+            'ember-source': '~4.12.0',
           },
         },
       },
       {
-        name: 'ember-lts-4.8',
+        name: 'ember-lts-5.4',
         npm: {
           devDependencies: {
-            'ember-source': '~4.8.0',
+            'ember-source': '~5.4.0',
           },
         },
       },
diff --git a/addons/core/tests/helpers/index.js b/addons/core/tests/helpers/index.js
index 371167e6c..b4c7ee08d 100644
--- a/addons/core/tests/helpers/index.js
+++ b/addons/core/tests/helpers/index.js
@@ -9,7 +9,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 
-// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
 // needed per test type.
 
diff --git a/ui/desktop/.gitignore b/ui/desktop/.gitignore
index aa468732c..55ac2a7d3 100644
--- a/ui/desktop/.gitignore
+++ b/ui/desktop/.gitignore
@@ -1,21 +1,15 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
@@ -25,7 +19,6 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
diff --git a/yarn.lock b/yarn.lock
index ce24dd653..9f750f281 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5563,6 +5563,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ember/test-helpers@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "@ember/test-helpers@npm:3.3.1"
+  dependencies:
+    "@ember/test-waiters": "npm:^3.0.2"
+    "@embroider/macros": "npm:^1.10.0"
+    "@simple-dom/interface": "npm:^1.4.0"
+    broccoli-debug: "npm:^0.6.5"
+    broccoli-funnel: "npm:^3.0.8"
+    dom-element-descriptors: "npm:^0.5.0"
+    ember-auto-import: "npm:^2.6.0"
+    ember-cli-babel: "npm:^8.2.0"
+    ember-cli-htmlbars: "npm:^6.2.0"
+  peerDependencies:
+    ember-source: ^4.0.0 || ^5.0.0
+  checksum: 10c0/dd77a2d10b51aff63be5f761646f6a0e65bb89b786f33fa6fcede95783cc397d9d27fa2aa8f471886ff1ac20198c68103665938ab91c957143418b7d273b6606
+  languageName: node
+  linkType: hard
+
 "@ember/test-helpers@npm:^4.0.5":
   version: 4.0.5
   resolution: "@ember/test-helpers@npm:4.0.5"
@@ -5579,7 +5598,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ember/test-waiters@npm:^2.4.3 || ^3.0.0, @ember/test-waiters@npm:^3, @ember/test-waiters@npm:^3.1.0":
+"@ember/test-waiters@npm:^2.4.3 || ^3.0.0, @ember/test-waiters@npm:^3, @ember/test-waiters@npm:^3.0.2, @ember/test-waiters@npm:^3.1.0":
   version: 3.1.0
   resolution: "@ember/test-waiters@npm:3.1.0"
   dependencies:
@@ -11425,12 +11444,11 @@ __metadata:
   resolution: "core@workspace:addons/core"
   dependencies:
     "@babel/core": "npm:^7.26.10"
-    "@babel/eslint-parser": "npm:^7.21.3"
-    "@babel/plugin-proposal-decorators": "npm:^7.21.0"
-    "@ember/optional-features": "npm:^2.0.0"
-    "@ember/string": "npm:^3.0.1"
-    "@ember/test-helpers": "npm:^4.0.5"
-    "@embroider/test-setup": "npm:^2.1.1"
+    "@babel/eslint-parser": "npm:^7.25.1"
+    "@babel/plugin-proposal-decorators": "npm:^7.24.7"
+    "@ember/optional-features": "npm:^2.1.0"
+    "@ember/test-helpers": "npm:^3.3.1"
+    "@embroider/test-setup": "npm:^4.0.0"
     "@faker-js/faker": "npm:^8.0.2"
     "@formatjs/intl-durationformat": "npm:^0.2.4"
     "@glimmer/component": "npm:^1.1.2"
@@ -11442,10 +11460,11 @@ __metadata:
     doctoc: "npm:^2.2.0"
     ember-auto-import: "npm:^2.10.0"
     ember-browser-services: "npm:^4.0.3"
-    ember-cli: "npm:^5.12.0"
+    ember-cli: "npm:~5.12.0"
     ember-cli-babel: "npm:^8.2.0"
+    ember-cli-clean-css: "npm:^3.0.0"
     ember-cli-dependency-checker: "npm:^3.3.2"
-    ember-cli-htmlbars: "npm:^6.2.0"
+    ember-cli-htmlbars: "npm:^6.3.0"
     ember-cli-inject-live-reload: "npm:^2.1.0"
     ember-cli-sass: "npm:^11.0.1"
     ember-cli-sri: "npm:^2.1.1"
@@ -11456,30 +11475,30 @@ __metadata:
     ember-intl: "npm:^7.0.7"
     ember-load-initializers: "npm:^2.1.2"
     ember-loading: "npm:^2.0.0"
-    ember-page-title: "npm:^7.0.0"
+    ember-page-title: "npm:^8.2.3"
     ember-qunit: "npm:^8.1.0"
-    ember-resolver: "npm:^10.0.0"
-    ember-source: "npm:~4.12.0"
+    ember-resolver: "npm:^12.0.1"
+    ember-source: "npm:~5.12.0"
     ember-source-channel-url: "npm:^3.0.0"
-    ember-template-lint: "npm:^5.7.2"
+    ember-template-lint: "npm:^6.0.0"
     ember-template-lint-plugin-prettier: "npm:^5.0.0"
     ember-truth-helpers: "npm:^4.0.3"
-    eslint: "npm:^8.54.0"
-    eslint-config-prettier: "npm:^9.0.0"
-    eslint-plugin-ember: "npm:^11.11.1"
-    eslint-plugin-n: "npm:^16.3.1"
-    eslint-plugin-qunit: "npm:^8.0.1"
+    eslint: "npm:^8.57.1"
+    eslint-config-prettier: "npm:^9.1.0"
+    eslint-plugin-ember: "npm:^12.2.1"
+    eslint-plugin-n: "npm:^16.6.2"
+    eslint-plugin-qunit: "npm:^8.1.2"
     filesize: "npm:^10.0.7"
     js-bexpr: "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1"
     loader.js: "npm:^4.7.0"
     lodash: "npm:^4.17.21"
-    prettier: "npm:^3.0.0"
+    prettier: "npm:^3.3.3"
     qunit: "npm:^2.22.0"
     qunit-dom: "npm:^3.2.1"
     rose: "workspace:*"
     sass: "npm:^1.69.5"
     sinon: "npm:^19.0.2"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.95.0"
   languageName: unknown
   linkType: soft
 
@@ -12450,7 +12469,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ember-auto-import@npm:^2.10.0, ember-auto-import@npm:^2.2.3, ember-auto-import@npm:^2.2.4, ember-auto-import@npm:^2.4.1, ember-auto-import@npm:^2.4.2, ember-auto-import@npm:^2.5.0, ember-auto-import@npm:^2.6.3, ember-auto-import@npm:^2.8.1":
+"ember-auto-import@npm:^2.10.0, ember-auto-import@npm:^2.2.3, ember-auto-import@npm:^2.2.4, ember-auto-import@npm:^2.4.1, ember-auto-import@npm:^2.4.2, ember-auto-import@npm:^2.5.0, ember-auto-import@npm:^2.6.0, ember-auto-import@npm:^2.6.3, ember-auto-import@npm:^2.8.1":
   version: 2.10.0
   resolution: "ember-auto-import@npm:2.10.0"
   dependencies: