Refactor upgrade ember 4 (#1501)

Upgrade Ember 4

Co-authored-by: Randall Morey <randall@randallmorey.com>
Co-authored-by: Zhihe Li <zhihe.li@hashicorp.com>

addons/api/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "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.
+  */
+  "isTypeScriptProject": false
 }

addons/api/.eslintignore

@@ -13,5 +13,13 @@
 # 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

addons/api/.eslintrc.js

@@ -29,21 +29,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',

addons/api/.npmignore

@@ -14,14 +14,27 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
+/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
+/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
+/yarn.lock.ember-try

addons/api/.prettierignore

@@ -14,3 +14,12 @@
 /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

addons/api/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "printWidth": 80
-}

addons/api/config/ember-try.js

@@ -0,0 +1,53 @@
+'use strict';
+
+const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
+
+module.exports = async function () {
+  return {
+    scenarios: [
+      {
+        name: 'ember-lts-3.28',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-4.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.4.0',
+          },
+        },
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+          },
+        },
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta'),
+          },
+        },
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
+          },
+        },
+      },
+      embroiderSafe(),
+      embroiderOptimized(),
+    ],
+  };
+};

addons/api/mirage/config.js

@@ -1,20 +1,37 @@
-import config from '../config/environment';
+import {
+  discoverEmberDataModels,
+  applyEmberDataSerializers,
+} from 'ember-cli-mirage';
+import { createServer, Response } from 'miragejs';
+import environmentConfig from '../config/environment';
 import { authHandler, deauthHandler } from './route-handlers/auth';
 import { targetHandler } from './route-handlers/target';
 import { pickRandomStatusString } from './factories/session';
-import { Response } from 'miragejs';
 import initializeMockIPC from './scenarios/ipc';
 import makeBooleanFilter from './helpers/bexpr-filter';
 
-const isTesting = config.environment === 'test';
+const isTesting = environmentConfig.environment === 'test';
 
-export default function () {
-  initializeMockIPC(this, config);
+// Main function
+// More info about server configuration https://www.ember-cli-mirage.com/docs/advanced/server-configuration
+export default function (mirageConfig) {
+  let finalConfig = {
+    ...mirageConfig,
+    models: { ...discoverEmberDataModels(), ...mirageConfig.models },
+    serializers: applyEmberDataSerializers(mirageConfig.serializers),
+    routes,
+  };
+  return createServer(finalConfig);
+}
+
+// Only routes are defined here
+function routes() {
+  initializeMockIPC(this, environmentConfig);
 
   // make this `http://localhost:8080`, for example, if your API is on a different server
   // this.urlPrefix = '';
   // make this `/api`, for example, if your API is namespaced
-  this.namespace = config.api.namespace;
+  this.namespace = environmentConfig.api.namespace;
   // delay for each request, automatically set to 0 during testing
   this.timing = 1;
 

addons/api/mirage/factories/auth-method.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/auth-method';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/credential-store.js

@@ -1,6 +1,6 @@
 import factory from '../generated/factories/credential-store';
 import { faker } from '@faker-js/faker';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/group.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/group';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/host-catalog.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/host-catalog';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';

addons/api/mirage/factories/role.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/role';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/scope.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/scope';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/session.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/session';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 

addons/api/mirage/factories/target.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/target';
-import { trait } from 'ember-cli-mirage';
+import { trait } from 'miragejs';
 import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';

addons/api/mirage/generated/factories/account.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/auth-method.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/credential-library.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/credential-store.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/credential.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/group.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/host-catalog.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/host-set.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/host.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/managed-group.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/org.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/project.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/role.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/scope.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/session.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/target.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 import { TYPE_TARGET_TCP } from 'api/models/target';
 

addons/api/mirage/generated/factories/user.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/generated/factories/worker.js

@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
 
 /**

addons/api/mirage/helpers/permissions.js

@@ -11,7 +11,7 @@ import { copy } from 'ember-copy';
  * Within a Mirage factory, pass the actions into the mock:
  *
  * @example
- *   import { Factory } from 'ember-cli-mirage';
+ *   import { Factory } from 'miragejs';
  *   import permissions from '../helpers/permissions';
  *
  *   export default Factory.extend({

addons/api/mirage/models/account.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/auth-method.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/base.js

@@ -1,4 +1,4 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({
   assignDefaults(defaultAttrs, attrs) {

addons/api/mirage/models/credential-library.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/credential-store.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/credential.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/group.js

@@ -1,4 +1,4 @@
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/host-catalog.js

@@ -1,4 +1,4 @@
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/host-set.js

@@ -1,4 +1,4 @@
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/host.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/managed-group.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/role.js

@@ -1,4 +1,4 @@
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/session.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/target.js

@@ -1,5 +1,5 @@
 import Model from './base';
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/user.js

@@ -1,4 +1,4 @@
-import { belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/models/worker.js

@@ -1,4 +1,4 @@
-import { belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'miragejs';
 import Model from './base';
 
 export default Model.extend({

addons/api/mirage/serializers/application.js

@@ -1,4 +1,4 @@
-import { RestSerializer } from 'ember-cli-mirage';
+import { RestSerializer } from 'miragejs';
 import { underscore } from '@ember/string';
 import { isArray } from '@ember/array';
 

addons/api/package.json

@@ -10,10 +10,8 @@
   "scripts": {
     "build:development": "ember build",
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
-    "lint:hbs": "ember-template-lint .",
-    "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint .",
     "lint:js:fix": "eslint . --fix",
     "format": "yarn run format:js",
@@ -25,27 +23,26 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
-    "@embroider/test-setup": "^0.48.1",
-    "ember-auto-import": "^2.4.2",
-    "ember-can": "^3.1.0",
+    "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.0",
-    "ember-cli-mirage": "^2.2.0",
+    "ember-cli-mirage": "^2.4.0",
     "ember-copy": "^2.0.1",
-    "ember-data": "^3.28.12",
+    "ember-data": "~4.4.0",
     "ember-fetch": "^8.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.5",
     "@babel/eslint-parser": "^7.18.2",
     "@babel/plugin-proposal-decorators": "^7.18.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1",
+    "@embroider/test-setup": "^1.6.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.2.0",
-    "ember-cli": "^4.4.0",
+    "ember-auto-import": "^2.4.3",
+    "ember-cli": "^4.4.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -53,11 +50,11 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.8",
+    "ember-source": "~4.4.0",
+    "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.14.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
@@ -67,8 +64,8 @@
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
-    "qunit": "^2.17.2",
+    "prettier": "^2.6.2",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
     "webpack": "^5.73.0"
   },

addons/api/tests/dummy/app/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/api/tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.24.0",
+      "version": "4.4.1",
       "blueprints": [
         {
           "name": "addon",

addons/api/tests/dummy/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

addons/api/tests/dummy/mirage/config.js

@@ -1,22 +1,5 @@
-export default function () {
-  // These comments are here to help you get started. Feel free to delete them.
-  /*
-    Config (with defaults).
+import { createServer } from 'miragejs';
 
-    Note: these only affect routes defined *after* them!
-  */
-  // this.urlPrefix = '';    // make this `http://localhost:8080`, for example, if your API is on a different server
-  // this.namespace = '';    // make this `/api`, for example, if your API is namespaced
-  // this.timing = 400;      // delay for each request, automatically set to 0 during testing
-  /*
-    Shorthand cheatsheet:
-
-    this.get('/posts');
-    this.post('/posts');
-    this.get('/posts/:id');
-    this.put('/posts/:id'); // or this.patch
-    this.del('/posts/:id');
-
-    https://www.ember-cli-mirage.com/docs/route-handlers/shorthands
-  */
+export default function (config) {
+  return createServer({ ...config });
 }

addons/api/tests/dummy/mirage/serializers/application.js

@@ -1,3 +1,3 @@
-import { JSONAPISerializer } from 'ember-cli-mirage';
+import { JSONAPISerializer } from 'miragejs';
 
 export default JSONAPISerializer.extend({});

addons/api/tests/helpers/index.js

@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };

addons/api/tests/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/api/tests/unit/models/base-test.js

@@ -120,10 +120,11 @@ module('Unit | Model | base', function (hooks) {
       return {};
     });
     await model.save();
-    this.server.delete('/v1/users', () => {
+    this.server.delete('/v1/users/u_123', () => {
       assert.ok(true, 'Correctly scoped delete record URL was requested.');
       return {};
     });
+    model.id = 'u_123';
     await model.destroyRecord();
   });
 
@@ -143,10 +144,11 @@ module('Unit | Model | base', function (hooks) {
       return {};
     });
     await model.save({ adapterOptions: { scopeID: customScopeID } });
-    this.server.delete('/v1/users', () => {
+    this.server.delete('/v1/users/u_123', () => {
       assert.ok(true, 'Correctly scoped delete record URL was requested.');
       return {};
     });
+    model.id = 'u_123';
     await model.destroyRecord({ adapterOptions: { scopeID: customScopeID } });
   });
 

addons/auth/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "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.
+  */
+  "isTypeScriptProject": false
 }

addons/auth/.eslintignore

@@ -13,4 +13,14 @@
 # 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
+config/ember-try

addons/auth/.eslintrc.js

@@ -29,21 +29,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',

addons/auth/.npmignore

@@ -14,14 +14,27 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
+/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
+/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
+/yarn.lock.ember-try

addons/auth/.prettierignore

@@ -14,3 +14,12 @@
 /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

addons/auth/config/ember-try.js

@@ -0,0 +1,53 @@
+'use strict';
+
+const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
+
+module.exports = async function () {
+  return {
+    scenarios: [
+      {
+        name: 'ember-lts-3.28',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-4.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.4.0',
+          },
+        },
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+          },
+        },
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta'),
+          },
+        },
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
+          },
+        },
+      },
+      embroiderSafe(),
+      embroiderOptimized(),
+    ],
+  };
+};

addons/auth/package.json

@@ -8,7 +8,7 @@
     "ember-addon"
   ],
   "scripts": {
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:js": "eslint .",
     "lint:js:fix": "eslint . --fix",
@@ -21,9 +21,7 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
-    "@embroider/test-setup": "^0.48.1",
-    "ember-auto-import": "^2.4.2",
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.0",
     "ember-fetch": "^8.1.1",
     "ember-simple-auth": "^4.2.2"
@@ -33,11 +31,13 @@
     "@babel/plugin-proposal-decorators": "^7.18.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1",
+    "@embroider/test-setup": "^1.6.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.2.0",
-    "ember-cli": "^4.4.0",
+    "ember-auto-import": "^2.4.3",
+    "ember-cli": "^4.4.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -46,11 +46,11 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.8",
+    "ember-source": "~4.4.0",
+    "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.14.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
@@ -60,10 +60,10 @@
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "pretender": "^3.4.3",
-    "prettier": "^2.5.1",
-    "qunit": "^2.17.2",
+    "prettier": "^2.6.2",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
-    "webpack": "5"
+    "webpack": "^5.72.1"
   },
   "engines": {
     "node": "12.* || 14.* || 16.*"

addons/auth/tests/dummy/app/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/auth/tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.24.0",
+      "version": "4.4.1",
       "blueprints": [
         {
           "name": "addon",

addons/auth/tests/dummy/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

addons/auth/tests/helpers/index.js

@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };

addons/auth/tests/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/core/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "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.
+  */
+  "isTypeScriptProject": false
 }

addons/core/.eslintignore

@@ -13,4 +13,13 @@
 # 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

addons/core/.eslintrc.js

@@ -29,21 +29,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',

addons/core/.npmignore

@@ -14,7 +14,10 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
@@ -23,5 +26,14 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/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
+/yarn.lock.ember-try

addons/core/.prettierignore

@@ -14,3 +14,12 @@
 /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

addons/core/package.json

@@ -15,7 +15,7 @@
   "scripts": {
     "build:development": "ember build",
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
@@ -35,7 +35,7 @@
     "auth": "*",
     "ember-auto-import": "^2.4.2",
     "ember-browser-services": "^4.0.3",
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.0",
     "ember-feature-flags": "^6.0.0",
     "ember-intl": "^6.0.0-beta.4",
@@ -47,13 +47,13 @@
     "@babel/plugin-proposal-decorators": "^7.18.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1",
-    "@embroider/test-setup": "^0.48.1",
+    "@embroider/test-setup": "^1.6.0",
     "@faker-js/faker": "^7.3.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.2.0",
-    "ember-cli": "^4.4.0",
+    "ember-cli": "^4.4.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -62,11 +62,10 @@
     "ember-export-application-global": "^2.0.1",
     "ember-inline-svg": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.8",
+    "ember-source": "~4.4.0",
     "ember-template-lint": "^4.14.0",
     "ember-template-lint-plugin-prettier": "^4.0.0",
     "eslint": "^8.18.0",
@@ -78,10 +77,10 @@
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "qunit": "^2.17.2",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
     "rose": "*",
-    "webpack": "5"
+    "webpack": "^5.72.1"
   },
   "engines": {
     "node": "12.* || 14.* || 16.*"

addons/core/tests/dummy/app/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/core/tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.24.0",
+      "version": "4.4.1",
       "blueprints": [
         {
           "name": "addon",

addons/core/tests/dummy/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

addons/core/tests/helpers/index.js

@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };

addons/core/tests/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

addons/core/tests/integration/helpers/format-date-iso-human-test.js

@@ -9,7 +9,7 @@ module('Integration | Helper | format-date-iso-human', function (hooks) {
   test('it renders', async function (assert) {
     this.set('inputValue', new Date('2020-01-01T00:00:00.999Z'));
 
-    await render(hbs`{{format-date-iso-human inputValue}}`);
+    await render(hbs`{{format-date-iso-human this.inputValue }}`);
 
     assert.strictEqual(this.element.textContent.trim(), '2020-01-01 00:00:00');
   });

addons/core/tests/integration/helpers/format-date-iso-test.js

@@ -9,7 +9,7 @@ module('Integration | Helper | format-date-iso', function (hooks) {
   test('it renders', async function (assert) {
     this.set('inputValue', new Date('2020-01-01T00:00:00.999Z'));
 
-    await render(hbs`{{format-date-iso inputValue}}`);
+    await render(hbs`{{format-date-iso this.inputValue}}`);
 
     assert.strictEqual(
       this.element.textContent.trim(),

addons/core/tests/integration/helpers/relative-datetime-live-test.js

@@ -2,9 +2,11 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
+import { setupIntl } from 'ember-intl/test-support';
 
 module('Integration | Helper | relative-datetime-live', function (hooks) {
   setupRenderingTest(hooks);
+  setupIntl(hooks);
 
   let now;
 

ui/admin/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "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.
+  */
+  "isTypeScriptProject": false
 }

ui/admin/.eslintignore

@@ -13,4 +13,13 @@
 # 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

ui/admin/.prettierignore

@@ -14,3 +14,12 @@
 /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

ui/admin/README.md

@@ -103,7 +103,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

ui/admin/app/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Admin</title>
     <meta name="description" content="Simple and secure remote access with HashiCorp Boundary.">
     <meta name="viewport" content="width=device-width, initial-scale=1">

ui/admin/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.24.0",
+      "version": "4.4.1",
       "blueprints": [
         {
           "name": "app",

ui/admin/config/environment.js

@@ -34,7 +34,7 @@ module.exports = function (environment) {
     modulePrefix: 'admin',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

ui/admin/package.json

@@ -16,7 +16,7 @@
     "build:oss": "EDITION=oss ember build --environment=production",
     "build:enterprise": "EDITION=enterprise ember build --environment=production",
     "build:hcp": "EDITION=hcp ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
@@ -55,9 +55,9 @@
     "doctoc": "^2.2.0",
     "ember-a11y-testing": "^4.2.0",
     "ember-auto-import": "^2.4.2",
-    "ember-cli": "^4.4.0",
+    "ember-cli": "^4.4.1",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-code-coverage": "^1.0.3",
     "ember-cli-content-security-policy": "^2.0.3",
     "ember-cli-dependency-checker": "^3.3.1",
@@ -71,13 +71,12 @@
     "ember-export-application-global": "^2.0.1",
     "ember-inline-svg": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-modifier": "^3.2.7",
     "ember-page-title": "^7.0.0",
     "ember-pollster": "^0.0.1-beta.2",
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.8",
+    "ember-source": "~4.4.0",
     "ember-template-lint": "^4.14.0",
     "ember-template-lint-plugin-prettier": "^4.0.0",
     "eslint": "^8.18.0",
@@ -89,14 +88,14 @@
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "qunit": "^2.17.2",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
     "rose": "*",
     "stylelint": "^14.14.0",
     "stylelint-config-prettier-scss": "^0.0.1",
     "stylelint-config-standard-scss": "^6.0.0",
     "sinon": "^14.0.0",
-    "webpack": "^5"
+    "webpack": "^5.72.1"
   },
   "engines": {
     "node": "12.* || 14.* || 16.*"

ui/admin/tests/acceptance/targets/brokered-credential-sources-test.js

@@ -199,7 +199,8 @@ module('Acceptance | targets | brokered credential sources', function (hooks) {
       brokeredCredentialSourceIds: [],
     });
     await visit(urls.brokeredCredentialSources);
-    await click(find('.rose-message-link'));
+    // Click on the rose message link
+    await click(find('.rose-message > .rose-message-body > a'));
     assert.strictEqual(currentURL(), urls.addBrokeredCredentialSources);
   });
 

ui/admin/tests/acceptance/targets/injected-application-credential-sources-test.js

@@ -196,7 +196,8 @@ module(
         injectedApplicationCredentialSourceIds: [],
       });
       await visit(urls.injectedApplicationCredentialSources);
-      await click(find('.rose-message-link'));
+      // Click on the rose message link
+      await click(find('.rose-message > .rose-message-body > a'));
       assert.strictEqual(
         currentURL(),
         urls.addInjectedApplicationCredentialSources

ui/admin/tests/helpers/index.js

@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };

ui/admin/tests/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Admin Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">