feat(modifier-managers): use 3.22 capabilities

BREAKING CHANGE: destruction behavior changed to use new args proxy from 3.22 Resolves the issue described by: emberjs/ember.js#19162 fixed by: emberjs/ember.js#19163 Ember apps < 3.22 are unaffected. This also adds Ember Try support for LTS 3.8 through 3.20
NullVoxPopuli · Oct 16, 2020 · 267ef12 · 267ef12
1 parent a2cfad4
commit 267ef12
Show file tree

Hide file tree

Showing 8 changed files with 3,997 additions and 3,480 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,6 +51,10 @@ jobs:
     - stage: "Additional Tests"
       env: EMBER_TRY_SCENARIO=ember-lts-2.18
     - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

diff --git a/addon/modifiers/did-insert.js b/addon/modifiers/did-insert.js
@@ -1,3 +1,4 @@
+import { gte } from 'ember-compatibility-helpers';
 import { setModifierManager, capabilities } from '@ember/modifier';
 
 /**
@@ -46,7 +47,7 @@ import { setModifierManager, capabilities } from '@ember/modifier';
 */
 export default setModifierManager(
   () => ({
-    capabilities: capabilities('3.13', { disableAutoTracking: true }),
+    capabilities: capabilities(gte('3.22.0') ? '3.22' : '3.13', { disableAutoTracking: true }),
 
     createModifier() {},
 

diff --git a/addon/modifiers/did-update.js b/addon/modifiers/did-update.js
@@ -1,3 +1,4 @@
+import { gte } from 'ember-compatibility-helpers';
 import { setModifierManager, capabilities } from '@ember/modifier';
 
 /**
@@ -58,7 +59,7 @@ import { setModifierManager, capabilities } from '@ember/modifier';
 */
 export default setModifierManager(
   () => ({
-    capabilities: capabilities('3.13', { disableAutoTracking: true }),
+    capabilities: capabilities(gte('3.22.0') ? '3.22' : '3.13', { disableAutoTracking: true }),
 
     createModifier() {
       return { element: null };

diff --git a/addon/modifiers/will-destroy.js b/addon/modifiers/will-destroy.js
@@ -1,3 +1,4 @@
+import { gte } from 'ember-compatibility-helpers';
 import { setModifierManager, capabilities } from '@ember/modifier';
 
 /**
@@ -40,7 +41,7 @@ import { setModifierManager, capabilities } from '@ember/modifier';
 */
 export default setModifierManager(
   () => ({
-    capabilities: capabilities('3.13', { disableAutoTracking: true }),
+    capabilities: capabilities(gte('3.22.0') ? '3.22' : '3.13', { disableAutoTracking: true }),
 
     createModifier() {
       return { element: null };

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -31,6 +31,30 @@ module.exports = function() {
             },
           },
         },
+        {
+          name: 'ember-lts-3.8',
+          npm: {
+            devDependencies: {
+              'ember-source': '~3.8.0',
+            },
+          },
+        },
+        {
+          name: 'ember-lts-3.12',
+          npm: {
+            devDependencies: {
+              'ember-source': '~3.12.0',
+            },
+          },
+        },
+        {
+          name: 'ember-lts-3.20',
+          npm: {
+            devDependencies: {
+              'ember-source': '~3.20.0',
+            },
+          },
+        },
         {
           name: 'ember-release',
           npm: {

diff --git a/package.json b/package.json
@@ -23,7 +23,8 @@
   },
   "dependencies": {
     "ember-cli-babel": "^7.10.0",
-    "ember-modifier-manager-polyfill": "^1.1.0"
+    "ember-compatibility-helpers": "^1.2.1",
+    "ember-modifier-manager-polyfill": "^1.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
@@ -37,7 +38,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.2.0",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.7.0",
+    "ember-source": "~3.22.0",
     "ember-source-channel-url": "^1.1.0",
     "ember-template-lint": "^1.1.0",
     "ember-try": "^1.0.0",

diff --git a/tests/integration/modifiers/did-update-test.js b/tests/integration/modifiers/did-update-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
+import { render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Modifier | did-update', function(hooks) {
@@ -23,5 +23,6 @@ module('Integration | Modifier | did-update', function(hooks) {
     );
 
     this.set('boundValue', 'update');
+    await settled();
   });
 });