Merge pull request #118 from GavinJoyce/support-ember-4

Support Ember 4
GavinJoyce · Dec 12, 2021 · c73b02b · c73b02b
2 parents 418874b + 2b8e4ee
commit c73b02b
Show file tree

Hide file tree

Showing 4 changed files with 208 additions and 1,044 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,12 +1,11 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - '*'
   pull_request:
+  push:
     branches:
-      - '*'
+      - main
+      - master
 
 jobs:
   lint:
@@ -78,7 +77,12 @@ jobs:
     needs: ['lint', 'test']
     strategy:
       matrix:
-        ember-try-scenario: [ember-minimum-supported, ember-release]
+        ember-try-scenario:
+          - ember-minimum-supported
+          - ember-lts-3-28
+          - ember-release
+          - ember-beta
+          - ember-canary
 
     steps:
       - uses: actions/checkout@v2

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -15,9 +15,16 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-3-28',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
-        allowedToFail: true, // TODO: Support Ember 4.0
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('release'),

diff --git a/package.json b/package.json
@@ -35,11 +35,11 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^1.0.2",
-    "@embroider/macros": "^0.43.5",
+    "@ember/render-modifiers": "^2.0.0",
+    "@embroider/macros": "^0.48.1",
     "ember-auto-import": "^2.2.0",
     "ember-cli-babel": "^7.26.3",
-    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-typescript": "^4.2.1",
     "ember-concurrency": "^2.1.2",
     "ember-element-helper": "^0.5.5",
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
-    "@embroider/test-setup": "^0.43.5",
+    "@embroider/test-setup": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "@nullvoxpopuli/eslint-configs": "^1.5.1",
@@ -84,7 +84,7 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "dotenv-cli": "^4.0.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.4",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deprecation-workflow": "^2.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -95,18 +95,18 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-modifier": "^2.1.2",
+    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-modifier": "^3.0.0",
     "ember-on-helper": "^0.1.0",
-    "ember-page-title": "^6.2.1",
+    "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.5.1",
     "ember-template-lint-plugin-prettier": "^2.0.1",
-    "ember-test-selectors": "^5.0.0",
-    "ember-try": "^1.4.0",
+    "ember-test-selectors": "^6.0.0",
+    "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-ember": "^10.5.5",