Remove Ember.$() jQuery integration

emberjs · May 27, 2021 · 118bb79 · 118bb79
1 parent d89786d
commit 118bb79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 60 deletions.
diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -99,7 +99,7 @@ import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
-import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
+import { EMBER_EXTEND_PROTOTYPES } from '@ember/deprecated-features';
 
 import {
   templateOnlyComponent,
@@ -613,32 +613,6 @@ Object.defineProperty(Ember, 'TEMPLATES', {
 */
 Ember.VERSION = VERSION;
 
-// ****@ember/-internals/views****
-if (JQUERY_INTEGRATION && !views.jQueryDisabled) {
-  Object.defineProperty(Ember, '$', {
-    get() {
-      deprecate(
-        "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead",
-        false,
-        {
-          id: 'ember-views.curly-components.jquery-element',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-apis',
-          for: 'ember-source',
-          since: {
-            enabled: '3.9.0',
-          },
-        }
-      );
-
-      return views.jQuery;
-    },
-
-    configurable: true,
-    enumerable: true,
-  });
-}
-
 Ember.ViewUtils = {
   isSimpleClick: views.isSimpleClick,
   getElementView: views.getElementView,
@@ -776,12 +750,3 @@ export default Ember;
  @public
  @static
  */
-
-/**
-  Alias for jQuery
-
-  @for jquery
-  @method $
-  @static
-  @public
-*/
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -1,9 +1,7 @@
 import Ember from '../index';
 import require from 'require';
-import { FEATURES, EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { confirmExport } from 'internal-test-helpers';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS, FEATURES } from '@ember/canary-features';
+import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
 import Resolver from '@ember/application/globals-resolver';
 import { DEBUG } from '@glimmer/env';
 import { ENV } from '@ember/-internals/environment';
@@ -136,26 +134,6 @@ moduleFor(
   }
 );
 
-if (!jQueryDisabled) {
-  moduleFor(
-    'ember reexports: jQuery enabled',
-    class extends AbstractTestCase {
-      [`@test Ember.$ is exported`](assert) {
-        expectDeprecation(() => {
-          let body = Ember.$('body').get(0);
-          assert.equal(body, document.body, 'Ember.$ exports working jQuery instance');
-        }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
-      }
-
-      '@test Ember.$ _**is**_ window.jQuery'(assert) {
-        expectDeprecation(() => {
-          assert.strictEqual(Ember.$, jQuery);
-        }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
-      }
-    }
-  );
-}
-
 let allExports = [
   // @ember/application
   ['Application', '@ember/application', 'default'],