Add support for import { capabilities } from '@ember/modifier'.

.github/workflows/nodejs.yml

@@ -58,6 +58,7 @@ jobs:
          - ember-3.6
          - ember-3.7
          - ember-lts-3.8
+         - ember-lts-3.12
          - ember-release
          - ember-beta
          - ember-canary

config/ember-try.js

@@ -87,6 +87,14 @@ module.exports = function() {
             },
           },
         },
+        {
+          name: 'ember-lts-3.12',
+          npm: {
+            devDependencies: {
+              'ember-source': '~3.12.0',
+            },
+          },
+        },
         {
           name: 'ember-release',
           npm: {

index.js

@@ -11,21 +11,24 @@ module.exports = {
     let checker = new VersionChecker(this.project);
     let emberVersion = checker.forEmber();
 
-    this.shouldPolyfill = emberVersion.lt('3.8.0-alpha.1');
+    this.shouldPolyfillManager = emberVersion.lt('3.8.0-alpha.1');
+    this.shouldPolyfillCapabilities = emberVersion.lt('3.13.0-beta.3');
   },
 
   included() {
     this._super.included.apply(this, arguments);
 
-    if (!this.shouldPolyfill) {
-      return;
+    if (this.shouldPolyfillManager) {
+      this.import('vendor/ember-modifier-manager-polyfill.js');
     }
 
-    this.import('vendor/ember-modifier-manager-polyfill.js');
+    if (this.shouldPolyfillCapabilities) {
+      this.import('vendor/ember-modifier-capabilities-polyfill.js');
+    }
   },
 
   treeForVendor(rawVendorTree) {
-    if (!this.shouldPolyfill) {
+    if (!this.shouldPolyfillManager && !this.shouldPolyfillCapabilities) {
       return;
     }
 

package.json

@@ -22,7 +22,7 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.4.2",
+    "ember-cli-babel": "^7.10.0",
     "ember-cli-version-checker": "^2.1.2",
     "ember-compatibility-helpers": "^1.2.0"
   },

tests/integration/components/modifier-manager-test.js

@@ -2,8 +2,8 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
-import Ember from 'ember';
 import { assign } from '@ember/polyfills';
+import { capabilities, setModifierManager } from '@ember/modifier';
 
 module('Integration | Component | modifier-manager', function(hooks) {
   setupRenderingTest(hooks);
@@ -18,10 +18,34 @@ module('Integration | Component | modifier-manager', function(hooks) {
     };
   });
 
+  module('capabilities', function() {
+    test('can set capabilities', async function(assert) {
+      class MyModifier {}
+
+      this.owner.register('modifier:my-modifier', MyModifier);
+
+      setModifierManager(
+        () => ({
+          capabilities: capabilities('3.13'),
+
+          createModifier(factory) {
+            assert.equal(factory.class, MyModifier, 'the factory class is Modifier');
+          },
+          installModifier() {},
+          updateModifier() {},
+          destroyModifier() {},
+        }),
+        MyModifier
+      );
+
+      await render(hbs`<div {{my-modifier}}></div>`);
+    });
+  });
+
   module('setModifierManager', function() {
     test('it returns the provided object', function(assert) {
       let expected = Object.freeze({});
-      let actual = Ember._setModifierManager(() => {}, expected);
+      let actual = setModifierManager(() => {}, expected);
 
       assert.strictEqual(actual, expected, 'the passed in object was returned');
     });
@@ -35,8 +59,9 @@ module('Integration | Component | modifier-manager', function(hooks) {
 
       this.owner.register('modifier:my-modifier', MyModifier);
 
-      Ember._setModifierManager(
+      setModifierManager(
         () => ({
+          capabilities: capabilities('3.13'),
           createModifier(factory) {
             assert.equal(factory.class, MyModifier, 'the factory class is Modifier');
           },
@@ -55,8 +80,9 @@ module('Integration | Component | modifier-manager', function(hooks) {
     hooks.beforeEach(function() {
       class DidInsertModifier {}
 
-      Ember._setModifierManager(
+      setModifierManager(
         () => ({
+          capabilities: capabilities('3.13'),
           createModifier(_factory, args) {
             return args.positional[0];
           },
@@ -124,8 +150,9 @@ module('Integration | Component | modifier-manager', function(hooks) {
     hooks.beforeEach(function() {
       class DidUpdateModifier {}
 
-      Ember._setModifierManager(
+      setModifierManager(
         () => ({
+          capabilities: capabilities('3.13'),
           createModifier() {
             return {};
           },
@@ -170,8 +197,9 @@ module('Integration | Component | modifier-manager', function(hooks) {
     hooks.beforeEach(function() {
       class WillDestroyModifier {}
 
-      Ember._setModifierManager(
+      setModifierManager(
         () => ({
+          capabilities: capabilities('3.13'),
           createModifier() {
             return {};
           },

tests/unit/modifier-manager-test.js

@@ -0,0 +1,20 @@
+import Ember from 'ember';
+import { capabilities } from '@ember/modifier';
+import { module, test } from 'qunit';
+
+module('Unit | Modifier Manager', function() {
+  test('sets up Ember._modifierManagerCapabilities', function(assert) {
+    assert.strictEqual(
+      typeof capabilities,
+      'function',
+      'import { capabilities } from "@ember/modifier" works properly'
+    );
+
+    // should be transformed by babel, this just confirms it
+    assert.strictEqual(
+      capabilities,
+      Ember._modifierManagerCapabilities,
+      'typoed name matches "real" name'
+    );
+  });
+});

vendor/ember-modifier-capabilities-polyfill.js

@@ -0,0 +1,31 @@
+/* globals Ember */
+/* eslint-disable ember/new-module-imports */
+
+import { assert, deprecate } from '@ember/debug';
+
+(() => {
+  'use strict';
+
+  // Ember < 3.13 had the export typoed, this ensures both the correct location
+  // and the typoed location work properly
+  Ember._modifierManagerCapabilties = Ember._modifierManagerCapabilities = function(managerAPI) {
+    if (!managerAPI) {
+      managerAPI = '3.13';
+
+      deprecate(
+        'Modifier manager capabilities now require you to pass a valid version when being generated. Valid versions include: 3.13',
+        false,
+        {
+          until: '3.17.0',
+          id: 'implicit-modifier-manager-capabilities',
+        }
+      );
+    }
+
+    assert('Invalid modifier manager compatibility specified', managerAPI === '3.13');
+
+    // Ember 3.13 added a feature for disabling auto-tracking, but it is
+    // impossible to polyfill the `false` version of that
+    return {};
+  };
+})();

vendor/ember-modifier-manager-polyfill.js

@@ -2,6 +2,7 @@
 /* eslint-disable ember/new-module-imports */
 
 import { lte, gte } from 'ember-compatibility-helpers';
+import { deprecate } from '@ember/debug';
 
 (() => {
   'use strict';
@@ -61,6 +62,19 @@ import { lte, gte } from 'ember-compatibility-helpers';
 
           let instance = definition.delegate.createModifier(definition.ModifierClass, modifierArgs);
 
+          if (definition.delegate.capabilities === undefined) {
+            definition.delegate.capabilities = Ember._modifierManagerCapabilities('3.13');
+
+            deprecate(
+              'Custom modifier managers must define their capabilities using the capabilities() helper function',
+              false,
+              {
+                until: '3.17.0',
+                id: 'implicit-modifier-manager-capabilities',
+              }
+            );
+          }
+
           return new CustomModifierState(element, definition.delegate, instance, capturedArgs);
         }