From c69ba5d0e6b2579af9a5d8cb428f6e38e5fdf106 Mon Sep 17 00:00:00 2001
From: Jonas Metzener <jonas.metzener@adfinis.com>
Date: Mon, 18 Mar 2024 10:39:01 +0100
Subject: [PATCH] feat(ember): officially support ember v5

---
 .github/workflows/ci.yml        |  1 +
 package.json                    |  2 +-
 tests/dummy/config/ember-try.js | 24 +++++++-----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 230038f9..f1c14244 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,6 +57,7 @@ jobs:
           - ember-lts-4.4
           - ember-lts-4.8
           - ember-lts-4.12
+          - ember-lts-5.4
           - ember-release
           - ember-beta
           - ember-canary
diff --git a/package.json b/package.json
index 20623f9e..10131a4f 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "edition": "octane"
   },
   "peerDependencies": {
-    "ember-source": "^4.0.0"
+    "ember-source": ">= 4.0.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js
index 7155d116..d5d3a8b1 100644
--- a/tests/dummy/config/ember-try.js
+++ b/tests/dummy/config/ember-try.js
@@ -14,9 +14,6 @@ module.exports = async function () {
             "ember-source": "~4.4.0",
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
-        },
       },
       {
         name: "ember-lts-4.8",
@@ -25,9 +22,6 @@ module.exports = async function () {
             "ember-source": "~4.8.0",
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
-        },
       },
       {
         name: "ember-lts-4.12",
@@ -36,8 +30,13 @@ module.exports = async function () {
             "ember-source": "~4.12.0",
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
+      },
+      {
+        name: "ember-lts-5.4",
+        npm: {
+          devDependencies: {
+            "ember-source": "~5.4.0",
+          },
         },
       },
       {
@@ -47,9 +46,6 @@ module.exports = async function () {
             "ember-source": await getChannelURL("release"),
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
-        },
       },
       {
         name: "ember-beta",
@@ -58,9 +54,6 @@ module.exports = async function () {
             "ember-source": await getChannelURL("beta"),
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
-        },
       },
       {
         name: "ember-canary",
@@ -69,9 +62,6 @@ module.exports = async function () {
             "ember-source": await getChannelURL("canary"),
           },
         },
-        env: {
-          EMBROIDER_TEST_SETUP_FORCE: "classic",
-        },
       },
       embroiderSafe(),
       embroiderOptimized(),