Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Reopening Built In Components #19664

Closed
wants to merge 1 commit into from
Closed

Remove Reopening Built In Components #19664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 1 addition & 70 deletions packages/@ember/-internals/glimmer/lib/components/-link-to.ts
View file
Open in desktop
Expand Up @@ -5,9 +5,7 @@
import { alias, computed } from '@ember/-internals/metal';
import { getOwner } from '@ember/-internals/owner';
import RouterState from '@ember/-internals/routing/lib/system/router_state';
import { CoreObject } from '@ember/-internals/runtime';
import { isSimpleClick } from '@ember/-internals/views';
import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
import { assert, deprecate, runInDebug, warn } from '@ember/debug';
import { EngineInstance, getEngineParent } from '@ember/engine';
import { flaggedInstrument } from '@ember/instrumentation';
Expand Down Expand Up @@ -1010,73 +1008,6 @@ const LinkComponent = EmberComponent.extend({

LinkComponent.toString = () => '@ember/routing/link-component';

LinkComponent.reopenClass({
positionalParams: 'params',
});

if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
Object.defineProperty(LinkComponent, '_wasReopened', {
configurable: true,
enumerable: false,
writable: true,
value: false,
});

Object.defineProperty(LinkComponent, 'reopen', {
configurable: true,
enumerable: false,
writable: true,
value: function reopen(this: typeof LinkComponent, ...args: unknown[]): unknown {
if (this === LinkComponent) {
deprecate(
'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

LinkComponent._wasReopened = true;
}

return CoreObject.reopen.call(this, ...args);
},
});

Object.defineProperty(LinkComponent, 'reopenClass', {
configurable: true,
enumerable: false,
writable: true,
value: function reopenClass(this: typeof LinkComponent, ...args: unknown[]): unknown {
if (this === LinkComponent) {
deprecate(
'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

LinkComponent._wasReopened = true;
}

return CoreObject.reopenClass.call(this, ...args);
},
});
}
LinkComponent.positionalParams = 'params';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dunno if this is kosher.


export default LinkComponent;
68 changes: 0 additions & 68 deletions packages/@ember/-internals/glimmer/lib/components/-textarea.ts
View file
Open in desktop
@@ -1,10 +1,7 @@
/**
@module @ember/component
*/
import { CoreObject } from '@ember/-internals/runtime';
import { TextSupport } from '@ember/-internals/views';
import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
import { deprecate } from '@ember/debug';
import Component from '../component';
import layout from '../templates/empty';

Expand Down Expand Up @@ -41,69 +38,4 @@ const TextArea = Component.extend(TextSupport, {

TextArea.toString = () => '@ember/component/text-area';

if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
Object.defineProperty(TextArea, '_wasReopened', {
configurable: true,
enumerable: false,
writable: true,
value: false,
});

Object.defineProperty(TextArea, 'reopen', {
configurable: true,
enumerable: false,
writable: true,
value: function reopen(this: typeof TextArea, ...args: unknown[]): unknown {
if (this === TextArea) {
deprecate(
'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

TextArea._wasReopened = true;
}

return CoreObject.reopen.call(this, ...args);
},
});

Object.defineProperty(TextArea, 'reopenClass', {
configurable: true,
enumerable: false,
writable: true,
value: function reopenClass(this: typeof TextArea, ...args: unknown[]): unknown {
if (this === TextArea) {
deprecate(
'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

TextArea._wasReopened = true;
}

return CoreObject.reopenClass.call(this, ...args);
},
});
}

export default TextArea;
69 changes: 1 addition & 68 deletions packages/@ember/-internals/glimmer/lib/components/checkbox.ts
View file
Open in desktop
@@ -1,7 +1,5 @@
import { set } from '@ember/-internals/metal';
import { FrameworkObject } from '@ember/-internals/runtime';
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 EmberComponent from '../component';
import layout from '../templates/empty';
Expand Down Expand Up @@ -160,69 +158,4 @@ if (DEBUG) {

Checkbox.toString = () => '@ember/component/checkbox';

if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
Object.defineProperty(Checkbox, '_wasReopened', {
configurable: true,
enumerable: false,
writable: true,
value: false,
});

Object.defineProperty(Checkbox, 'reopen', {
configurable: true,
enumerable: false,
writable: true,
value: function reopen(this: typeof Checkbox, ...args: unknown[]): unknown {
if (this === Checkbox) {
deprecate(
'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

Checkbox._wasReopened = true;
}

return FrameworkObject.reopen.call(this, ...args);
},
});

Object.defineProperty(Checkbox, 'reopenClass', {
configurable: true,
enumerable: false,
writable: true,
value: function reopenClass(this: typeof Checkbox, ...args: unknown[]): unknown {
if (this === Checkbox) {
deprecate(
'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

Checkbox._wasReopened = true;
}

return FrameworkObject.reopenClass.call(this, ...args);
},
});
}

export default Checkbox;
68 changes: 0 additions & 68 deletions packages/@ember/-internals/glimmer/lib/components/text-field.ts
View file
Open in desktop
Expand Up @@ -3,10 +3,7 @@
*/
import { hasDOM } from '@ember/-internals/browser-environment';
import { computed } from '@ember/-internals/metal';
import { CoreObject } from '@ember/-internals/runtime';
import { TextSupport } from '@ember/-internals/views';
import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
import { deprecate } from '@ember/debug';
import Component from '../component';
import layout from '../templates/empty';

Expand Down Expand Up @@ -204,69 +201,4 @@ const TextField = Component.extend(TextSupport, {

TextField.toString = () => '@ember/component/text-field';

if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
Object.defineProperty(TextField, '_wasReopened', {
configurable: true,
enumerable: false,
writable: true,
value: false,
});

Object.defineProperty(TextField, 'reopen', {
configurable: true,
enumerable: false,
writable: true,
value: function reopen(this: typeof TextField, ...args: unknown[]): unknown {
if (this === TextField) {
deprecate(
'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

TextField._wasReopened = true;
}

return CoreObject.reopen.call(this, ...args);
},
});

Object.defineProperty(TextField, 'reopenClass', {
configurable: true,
enumerable: false,
writable: true,
value: function reopenClass(this: typeof TextField, ...args: unknown[]): unknown {
if (this === TextField) {
deprecate(
'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
'wrapper component or create a custom subclass.',
false,
{
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
}
);

TextField._wasReopened = true;
}

return CoreObject.reopenClass.call(this, ...args);
},
});
}

export default TextField;
5 changes: 0 additions & 5 deletions packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
View file
Open in desktop
Expand Up @@ -1597,10 +1597,5 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
this.assertDeopt(false, false);
};
}

moduleFor(
`Components test: [DEPRECATED] <Input /> and <Textarea /> deopt (${label})`,
DeoptTest
);
});
}
25 changes: 1 addition & 24 deletions packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
import { context } from '@ember/-internals/environment';
import { get, Mixin, computed } from '@ember/-internals/metal';
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';

if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
Expand Down Expand Up @@ -161,29 +161,6 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
value: false,
});

Object.defineProperty(TargetActionSupport, 'reopen', {
configurable: true,
enumerable: false,
writable: true,
value: function reopen(...args) {
if (this === TargetActionSupport) {
deprecate('Reopening Ember.TargetActionSupport is deprecated.', false, {
id: 'ember.built-in-components.reopen',
for: 'ember-source',
since: {
enabled: '3.27.0',
},
until: '4.0.0',
url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
});

TargetActionSupport._wasReopened = true;
}

return Mixin.prototype.reopen.call(this, ...args);
},
});

if (DEBUG) {
Object.seal(TargetActionSupport);
Mixin._disableDebugSeal = false;
Expand Down