[CLEANUP] Remove Ember.Component#defaultLayout

features.json

@@ -22,7 +22,6 @@
     "ember-debug.deprecate-until-missing": "2.1.0",
     "ember-debug.warn-options-missing": "2.1.0",
     "ember-debug.warn-id-missing": "2.1.0",
-    "ember-views.component.defaultLayout": "2.3.0",
     "ember-routing-views.controller-wrapped-param": "2.0.0",
     "ember-htmlbars.make-bound-helper": "1.13.6",
     "ember-htmlbars.ember-handlebars-safestring": "2.8.0",

packages/ember-glimmer/lib/component.ts

@@ -571,23 +571,6 @@ const Component = CoreView.extend(
       this[ROOT_REF] = new RootReference(this);
       this[BOUNDS] = null;
 
-      // If a `defaultLayout` was specified move it to the `layout` prop.
-      // `layout` is no longer a CP, so this just ensures that the `defaultLayout`
-      // logic is supported with a deprecation
-      if (this.defaultLayout && !this.layout) {
-        deprecate(
-          `Specifying \`defaultLayout\` to ${this} is deprecated. Please use \`layout\` instead.`,
-          false,
-          {
-            id: 'ember-views.component.defaultLayout',
-            until: '3.0.0',
-            url: 'https://emberjs.com/deprecations/v2.x/#toc_ember-component-defaultlayout',
-          },
-        );
-
-        this.layout = this.defaultLayout;
-      }
-
       // If in a tagless component, assert that no event handlers are defined
       assert(
         // tslint:disable-next-line:max-line-length

packages/ember-glimmer/tests/integration/components/curly-components-test.js

@@ -118,42 +118,6 @@ moduleFor('Components test: curly components', class extends RenderingTest {
     this.assertText('FIZZ BAR hey');
   }
 
-  ['@test can specify template with `defaultLayout` property [DEPRECATED]']() {
-    expectDeprecation(/Specifying `defaultLayout` to .* is deprecated. Please use `layout` instead/);
-    let FooBarComponent = Component.extend({
-      elementId: 'blahzorz',
-      defaultLayout: compile('much wat {{lulz}}'),
-      init() {
-        this._super(...arguments);
-        this.lulz = 'hey';
-      }
-    });
-
-    this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
-
-    this.render('{{foo-bar}}');
-
-    this.assertText('much wat hey');
-  }
-
-  ['@test layout takes precedence over defaultLayout']() {
-    let FooBarComponent = Component.extend({
-      elementId: 'blahzorz',
-      layout: compile('so much layout wat {{lulz}}'),
-      defaultLayout: compile('much wat {{lulz}}'),
-      init() {
-        this._super(...arguments);
-        this.lulz = 'hey';
-      }
-    });
-
-    this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
-
-    this.render('{{foo-bar}}');
-
-    this.assertText('so much layout wat hey');
-  }
-
   ['@test layout supports computed property']() {
     let FooBarComponent = Component.extend({
       elementId: 'blahzorz',

packages/ember/tests/component_registration_test.js

@@ -120,53 +120,6 @@ moduleFor('Application Lifecycle - Component Registration', class extends Autobo
     assert.equal(text, 'inner-outer', 'The component is composed correctly');
   }
 
-  ['@test Assigning defaultLayout to a component should set it up as a layout if no layout was found [DEPRECATED]'](assert) {
-    assert.expect(2);
-
-    expectDeprecation(() => {
-      this.runTask(() => {
-        this.createApplication();
-
-        this.addTemplate('application', `<div id='wrapper'>{{#my-component}}{{text}}{{/my-component}}</div>`);
-
-        this.applicationInstance.register('controller:application', Controller.extend({
-          text: 'outer'
-        }));
-        this.applicationInstance.register('component:my-component', Component.extend({
-          text: 'inner',
-          defaultLayout: this.compile('{{text}}-{{yield}}')
-        }));
-      });
-    });
-
-    let text = this.$('#wrapper').text().trim();
-    assert.equal(text, 'inner-outer', 'The component is composed correctly');
-  }
-
-  ['@test Assigning defaultLayout to a component should set it up as a layout if layout was found [DEPRECATED]'](assert) {
-    assert.expect(2);
-
-    expectDeprecation(() => {
-      this.runTask(() => {
-        this.createApplication();
-
-        this.addTemplate('application', `<div id='wrapper'>{{#my-component}}{{text}}{{/my-component}}</div>`);
-        this.addTemplate('components/my-component', '{{text}}-{{yield}}');
-
-        this.applicationInstance.register('controller:application', Controller.extend({
-          text: 'outer'
-        }));
-        this.applicationInstance.register('component:my-component', Component.extend({
-          text: 'inner',
-          defaultLayout: this.compile('should not see this!')
-        }));
-      });
-    }, /Specifying `defaultLayout` to .+ is deprecated\./);
-
-    let text = this.$('#wrapper').text().trim();
-    assert.equal(text, 'inner-outer', 'The component is composed correctly');
-  }
-
   /*
    * When an exception is thrown during the initial rendering phase, the
    * `visit` promise is not resolved or rejected. This means the `applicationInstance`
@@ -195,4 +148,4 @@ moduleFor('Application Lifecycle - Component Registration', class extends Autobo
       });
     }, /.* named "no-good" .*/);
   }
-});
+});