Merge pull request #821 from elwayman02/ember-5-update

Ember 5 Dependencies + Drop 3.28 Support
elwayman02 · Oct 11, 2023 · dcda211 · dcda211
2 parents 1318431 + 3793e15
commit dcda211
Show file tree

Hide file tree

Showing 4 changed files with 1,107 additions and 218 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,12 +52,10 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.28
           - ember-lts-4.4
           - ember-lts-4.8
           - ember-lts-4.12
           - ember-release
-          - ember-classic
           - embroider-safe
           - embroider-optimized
         experimental: [false]

diff --git a/package.json b/package.json
@@ -32,22 +32,23 @@
   },
   "dependencies": {
     "ember-auto-import": "^2.6.3",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.2.0",
+    "ember-cli-babel": "^7.26.11 || ^8.0.0",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-modifier": "^4.1.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.22.15",
     "@babel/plugin-proposal-decorators": "^7.22.15",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^2.9.4",
+    "@ember/test-helpers": "^3.2.0",
     "@embroider/test-setup": "^2.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.1",
-    "ember-cli": "~4.12.2",
+    "ember-cli": "~5.3.0",
+    "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-deprecation-workflow": "^2.0.0",
     "ember-cli-fastboot": "^4.1.1",
@@ -57,8 +58,8 @@
     "ember-cli-terser": "^4.0.2",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
+    "ember-page-title": "^8.0.0",
+    "ember-qunit": "^7.0.0",
     "ember-resolver": "^11.0.1",
     "ember-sinon-qunit": "^6.0.0",
     "ember-source": "~5.3.0",
@@ -87,7 +88,7 @@
     "webpack": "^5.88.2"
   },
   "peerDependencies": {
-    "ember-source": "^3.28.0 || ^4.0.0 || >=5.0.0"
+    "ember-source": "^4.0.0 || >=5.0.0"
   },
   "engines": {
     "node": "16.* || >= 18"

diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js
@@ -7,14 +7,6 @@ module.exports = async function () {
   return {
     useYarn: true,
     scenarios: [
-      {
-        name: 'ember-lts-3.28',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.28.0',
-          },
-        },
-      },
       {
         name: 'ember-lts-4.4',
         npm: {
@@ -63,24 +55,6 @@ module.exports = async function () {
           },
         },
       },
-      {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.28.0',
-          },
-          ember: {
-            edition: 'classic',
-          },
-        },
-      },
       embroiderSafe(),
       embroiderOptimized(),
     ],