Merge branch 'main' into feature-add-new-fields-host-catalog

addons/api/package.json

@@ -43,7 +43,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.0.1",
     "ember-auto-import": "^1.12.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",

addons/auth/package.json

@@ -36,7 +36,7 @@
     "core": "*",
     "doctoc": "^2.0.1",
     "ember-auto-import": "^1.12.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",

addons/core/package.json

@@ -49,7 +49,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.0.1",
     "ember-auto-import": "^1.12.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",

addons/rose/package.json

@@ -62,7 +62,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.0.1",
     "ember-auto-import": "^1.12.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^10.0.1",
@@ -87,6 +87,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^6.2.0",
+    "jest": "^27.4.7",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.0",

ui/admin/package.json

@@ -50,7 +50,7 @@
     "ember-a11y-testing": "^4.2.0",
     "ember-auto-import": "^1.12.0",
     "ember-breadcrumbs": "^0.2.3",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.8",
     "ember-cli-code-coverage": "^1.0.3",

ui/desktop/package.json

@@ -71,7 +71,7 @@
     "ember-a11y-testing": "^4.2.0",
     "ember-auto-import": "^1.12.0",
     "ember-autofocus-modifier": "^2.0.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.8",
     "ember-cli-code-coverage": "^1.0.3",