chore: remove most of the unnecessary left-overs

buschtoens · May 11, 2019 · ed8c46a · ed8c46a
1 parent 2b80ba4
commit ed8c46a
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 180 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,6 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
-    - env: EMBER_TRY_SCENARIO=ember-default-with-ember-event-helpers
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

diff --git a/addon/helpers/prevent-default.js b/addon/helpers/prevent-default.js
diff --git a/app/helpers/prevent-default.js b/app/helpers/prevent-default.js
diff --git a/app/modifiers/on.js b/app/modifiers/on.js
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -93,17 +93,6 @@ module.exports = function() {
               '@ember/jquery': '^0.5.1'
             }
           }
-        },
-        {
-          name: 'ember-default-with-ember-event-helpers',
-          env: {
-            EMBER_EVENT_HELPERS_INSTALLED: true
-          },
-          npm: {
-            devDependencies: {
-              'ember-event-helpers': '^0.1.0'
-            }
-          }
         }
       ]
     };

diff --git a/index.js b/index.js
@@ -1,54 +1,5 @@
 'use strict';
 
-const VersionChecker = require('ember-cli-version-checker');
-const Funnel = require('broccoli-funnel');
-
 module.exports = {
-  name: require('./package').name,
-
-  included(...args) {
-    this._super.included.apply(this, args);
-
-    const checker = new VersionChecker(this.project);
-    const ember = checker.forEmber();
-
-    this.hasNativeOnModifier = ember.gte('3.11.0-beta.1');
-
-    this.hasEventHelpers = Boolean(
-      this.project.findAddonByName('ember-event-helpers')
-    );
-
-    if (this.hasNativeOnModifier && this.parent === this.project) {
-      let message =
-        'The `{{on}}` modifier is available natively since Ember 3.11.0-beta.1. You can remove `ember-on-helper` from your `package.json`.';
-
-      if (!this.hasEventHelpers) {
-        message +=
-          ' If you use the `(prevent-default)` helper, please install `ember-event-helpers`.';
-      }
-
-      this.ui.writeDeprecateLine(message);
-    }
-  },
-
-  treeForApp(...args) {
-    return this.filterTree(this._super.treeForApp.apply(this, args));
-  },
-
-  treeForAddon(...args) {
-    return this.filterTree(this._super.treeForAddon.apply(this, args));
-  },
-
-  filterTree(tree) {
-    const exclude = [];
-
-    if (this.hasNativeOnModifier) {
-      exclude.push(/modifiers/);
-    }
-    if (this.hasEventHelpers) {
-      exclude.push(/helpers/);
-    }
-
-    return new Funnel(tree, { exclude });
-  }
+  name: require('./package').name
 };
diff --git a/package.json b/package.json
@@ -27,9 +27,7 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "broccoli-funnel": "^2.0.2",
-    "ember-cli-babel": "^7.7.3",
-    "ember-cli-version-checker": "^3.1.3"
+    "ember-cli-babel": "^7.7.3"
   },
   "devDependencies": {
     "@clark/eslint-config-ember": "^0.5.1",

diff --git a/tests/helpers/ember-event-helpers.js b/tests/helpers/ember-event-helpers.js
diff --git a/tests/helpers/ember-on-modifier-polyfill.js b/tests/helpers/ember-on-modifier-polyfill.js
diff --git a/tests/integration/.gitkeep b/tests/integration/.gitkeep
diff --git a/tests/unit/helpers/prevent-default-test.js b/tests/unit/helpers/prevent-default-test.js
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
diff --git a/yarn.lock b/yarn.lock
@@ -3152,7 +3152,7 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-ve
     resolve "^1.3.3"
     semver "^5.3.0"
 
-ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-version-checker@^3.1.3:
+ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
   integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==