From 579356ec1c7914179a7cbdb52d5e64cbe8247132 Mon Sep 17 00:00:00 2001 From: Sergey Astapov Date: Mon, 8 Nov 2021 21:03:24 -0500 Subject: [PATCH] [CLEANUP beta] Remove Ember.Component.reopen --- .../-internals/glimmer/lib/component.ts | 62 +------- .../components/input-angle-test.js | 137 ------------------ 2 files changed, 2 insertions(+), 197 deletions(-) diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts index 3633fb24854..c1d4a9ceab8 100644 --- a/packages/@ember/-internals/glimmer/lib/component.ts +++ b/packages/@ember/-internals/glimmer/lib/component.ts @@ -1,6 +1,6 @@ import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal'; import { getOwner } from '@ember/-internals/owner'; -import { CoreObject, TargetActionSupport } from '@ember/-internals/runtime'; +import { TargetActionSupport } from '@ember/-internals/runtime'; import { ActionSupport, ChildViewsSupport, @@ -12,7 +12,7 @@ import { ViewStateSupport, } from '@ember/-internals/views'; import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features'; -import { assert, deprecate } from '@ember/debug'; +import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { Environment } from '@glimmer/interfaces'; import { setInternalComponentManager } from '@glimmer/manager'; @@ -1051,64 +1051,6 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) { writable: true, value: false, }); - - Object.defineProperty(Component, 'reopen', { - configurable: true, - enumerable: false, - writable: true, - value: function reopen(this: typeof Component, ...args: unknown[]): unknown { - if (this === Component) { - deprecate( - 'Reopening the Ember.Component super class itself is deprecated. ' + - 'Consider alternatives such as installing event listeners on ' + - 'the document or add the customizations to specific subclasses.', - false, - { - id: 'ember.component.reopen', - for: 'ember-source', - since: { - enabled: '3.27.0', - }, - url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen', - until: '4.0.0', - } - ); - - Component._wasReopened = true; - } - - return CoreObject.reopen.call(this, ...args); - }, - }); - - Object.defineProperty(Component, 'reopenClass', { - configurable: true, - enumerable: false, - writable: true, - value: function reopenClass(this: typeof Component, ...args: unknown[]): unknown { - if (this === Component) { - deprecate( - 'Reopening the Ember.Component super class itself is deprecated. ' + - 'Consider alternatives such as installing event listeners on ' + - 'the document or add the customizations to specific subclasses.', - false, - { - id: 'ember.component.reopen', - for: 'ember-source', - url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen', - since: { - enabled: '3.27.0', - }, - until: '4.0.0', - } - ); - - Component._wasReopened = true; - } - - return CoreObject.reopenClass.call(this, ...args); - }, - }); } export default Component; diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js index 3a7693f42b2..b2f31de645e 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js @@ -1,10 +1,7 @@ import { moduleFor, RenderingTestCase, runDestroy, runTask } from 'internal-test-helpers'; import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features'; import { action } from '@ember/object'; -import { Checkbox, TextArea, TextField } from '@ember/-internals/glimmer'; import { set } from '@ember/-internals/metal'; -import { TargetActionSupport } from '@ember/-internals/runtime'; -import { getElementView, TextSupport } from '@ember/-internals/views'; import { Component } from '../../utils/helpers'; @@ -1321,137 +1318,3 @@ function InputAttributesTest(attrs) { } ); }); - -if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) { - [ - ['Ember.Component', Component, true, true], - ['Ember.Checkbox', Checkbox, true, false], - ['Ember.TextArea', TextArea, false, true], - ['Ember.TextField', TextField, true, false], - ['Ember.TextSupport', TextSupport, true, true], - ['Ember.TargetActionSupport', TargetActionSupport, true, true], - ].forEach(([label, ClassOrMixin, shouldDeoptInput, shouldDeoptTextArea]) => { - let message = - ClassOrMixin === Component - ? /Reopening the Ember\.Component super class itself is deprecated\./ - : new RegExp(`Reopening ${label.replace(/\./g, '\\.')} is deprecated\\.`); - - class DeoptTest extends RenderingTestCase { - constructor() { - super(...arguments); - this.assertDidNotReopen(); - } - - teardown() { - super.teardown(); - ClassOrMixin._wasReopened = false; - } - - assertDidReopen() { - this.assert.strictEqual(ClassOrMixin._wasReopened, true, `${label} was marked as reopened`); - } - - assertDidNotReopen() { - this.assert.strictEqual( - ClassOrMixin._wasReopened, - false, - `${label} was not marked as reopened` - ); - } - - assertDeopt( - _shouldDeoptInput = shouldDeoptInput, - _shouldDeoptTextArea = shouldDeoptTextArea - ) { - this.render(` - - -