refactor: Unpodded components. Sorted import paths (addon only).

ijlee2 · ijlee2 · commit d7f5a050e276 · 2025-11-05T08:21:42.000+01:00
diff --git a/README.md b/README.md
@@ -187,7 +187,7 @@ declare module '@glint/environment-ember-loose/registry' {
 ```ts
 // my-table-component.ts
 import type { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTableComponent from 'ember-table/components/ember-table/component';
+import EmberTableComponent from 'ember-table/components/ember-table';
 
 interface MyTableColumn extends EmberTableColumn {
   // Add any custom column attribute types here (optional)
diff --git a/addon-test-support/index.js b/addon-test-support/index.js
@@ -1,8 +1,8 @@
 import TablePage from './pages/ember-table';
 import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
-import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody/component';
-import { setupTHeadForTest } from 'ember-table/components/ember-thead/component';
-import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td/component';
+import { setSetupRowCountForTest } from 'ember-table/components/ember-tbody';
+import { setupTHeadForTest } from 'ember-table/components/ember-thead';
+import { setSimpleCheckboxForTest } from 'ember-table/components/ember-td';
 
 function setupForTest() {
   registerWaiter();
diff --git a/addon/components/-private/base-table-cell.js b/addon/components/-private/base-table-cell.js
@@ -1,8 +1,9 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { equal, readOnly } from '@ember/object/computed';
-import { observer } from '../../-private/utils/observer';
 import { scheduleOnce } from '@ember/runloop';
-import { computed } from '@ember/object';
+
+import { observer } from '../../-private/utils/observer';
 
 export default Component.extend({
   // Provided by subclasses
diff --git a/addon/components/-private/row-wrapper.hbs b/addon/components/-private/row-wrapper.hbs
@@ -0,0 +1 @@
+{{yield this.api}}
diff --git a/addon/components/-private/row-wrapper.js b/addon/components/-private/row-wrapper.js
@@ -1,12 +1,10 @@
+import { A as emberA } from '@ember/array';
 import Component from '@ember/component';
-import hbs from 'htmlbars-inline-precompile';
-
 import EmberObject, { get, setProperties, computed, defineProperty } from '@ember/object';
 import { alias } from '@ember/object/computed';
-import { A as emberA } from '@ember/array';
 
-import { notifyPropertyChange } from '../../-private/utils/ember';
 import { objectAt } from '../../-private/utils/array';
+import { notifyPropertyChange } from '../../-private/utils/ember';
 import { observer } from '../../-private/utils/observer';
 
 const CellWrapper = EmberObject.extend({
@@ -31,10 +29,7 @@ const CellWrapper = EmberObject.extend({
   }),
 });
 
-const layout = hbs`{{yield this.api}}`;
-
 export default Component.extend({
-  layout,
   tagName: '',
 
   canSelect: undefined,
diff --git a/addon/components/-private/scroll-indicators.hbs b/addon/components/-private/scroll-indicators.hbs
diff --git a/addon/components/-private/scroll-indicators.js b/addon/components/-private/scroll-indicators.js
@@ -6,8 +6,8 @@ import { bind, scheduleOnce } from '@ember/runloop';
 import { capitalize } from '@ember/string';
 import { htmlSafe } from '@ember/template';
 import { isEmpty, isNone } from '@ember/utils';
-import { addObserver } from 'ember-table/-private/utils/observer';
-import layout from './template';
+
+import { addObserver } from '../../-private/utils/observer';
 
 /**
    Computed property macro that builds the CSS styles (position, height)
@@ -122,7 +122,6 @@ const showIndicator = location => {
 };
 
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-table-loading-more.js b/addon/components/ember-table-loading-more.js
diff --git a/addon/components/ember-table-simple-checkbox.js b/addon/components/ember-table-simple-checkbox.js
@@ -1,4 +1,5 @@
 import Component from '@ember/component';
+
 import defaultTo from '../-private/utils/default-to';
 
 export default Component.extend({
diff --git a/addon/components/ember-table.hbs b/addon/components/ember-table.hbs
diff --git a/addon/components/ember-table.js b/addon/components/ember-table.js
@@ -1,12 +1,11 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { htmlSafe } from '@ember/template';
+
 import {
   setupTableStickyPolyfill,
   teardownTableStickyPolyfill,
-} from '../../-private/sticky/table-sticky-polyfill';
-
-import layout from './template';
+} from '../-private/sticky/table-sticky-polyfill';
 
 /**
   The primary Ember Table component. This component represents the root of the
@@ -30,7 +29,6 @@ import layout from './template';
   @public
 */
 export default Component.extend({
-  layout,
   classNames: ['ember-table'],
   attributeBindings: ['dataTestEmberTable:data-test-ember-table'],
   dataTestEmberTable: true,
diff --git a/addon/components/ember-tbody.hbs b/addon/components/ember-tbody.hbs
diff --git a/addon/components/ember-tbody.js b/addon/components/ember-tbody.js
@@ -1,14 +1,12 @@
 import Component from '@ember/component';
-import { scheduleOnce } from '@ember/runloop';
+import { assert } from '@ember/debug';
 import { computed } from '@ember/object';
-import { observer } from '../../-private/utils/observer';
 import { bool, readOnly, or } from '@ember/object/computed';
+import { scheduleOnce } from '@ember/runloop';
 
-import CollapseTree, { SELECT_MODE } from '../../-private/collapse-tree';
-import defaultTo from '../../-private/utils/default-to';
-
-import layout from './template';
-import { assert } from '@ember/debug';
+import CollapseTree, { SELECT_MODE } from '../-private/collapse-tree';
+import defaultTo from '../-private/utils/default-to';
+import { observer } from '../-private/utils/observer';
 
 let setupRowCountForTest = false;
 export function setSetupRowCountForTest(bool) {
@@ -40,7 +38,6 @@ export function setSetupRowCountForTest(bool) {
   @public
 */
 export default Component.extend({
-  layout,
   tagName: 'tbody',
 
   /**
diff --git a/addon/components/ember-td.hbs b/addon/components/ember-td.hbs
diff --git a/addon/components/ember-td.js b/addon/components/ember-td.js
@@ -1,10 +1,8 @@
-import BaseTableCell from '../-private/base-table-cell';
-
 import { computed, action } from '@ember/object';
 import { alias, readOnly } from '@ember/object/computed';
 
-import layout from './template';
-import { SELECT_MODE } from '../../-private/collapse-tree';
+import BaseTableCell from './-private/base-table-cell';
+import { SELECT_MODE } from '../-private/collapse-tree';
 
 let setupSimpleCheckboxForTest = false;
 export function setSimpleCheckboxForTest(bool) {
@@ -41,7 +39,6 @@ export function setSimpleCheckboxForTest(bool) {
  @public
  */
 export default BaseTableCell.extend({
-  layout,
   tagName: 'td',
 
   init() {
diff --git a/addon/components/ember-tfoot.hbs b/addon/components/ember-tfoot.hbs
diff --git a/addon/components/ember-tfoot.js b/addon/components/ember-tfoot.js
@@ -1,9 +1,7 @@
-import EmberTBody from '../ember-tbody/component';
 import { A as emberA } from '@ember/array';
-
 import { computed } from '@ember/object';
 
-import layout from './template';
+import EmberTBody from './ember-tbody';
 
 /**
   The table footer component. This component manages any footer rows which may
@@ -30,7 +28,6 @@ import layout from './template';
   @public
 */
 export default EmberTBody.extend({
-  layout,
   tagName: 'tfoot',
 
   wrappedRowArray: computed('wrappedRows.[]', function() {
diff --git a/addon/components/ember-th.hbs b/addon/components/ember-th.hbs
diff --git a/addon/components/ember-th.js b/addon/components/ember-th.js
@@ -1,12 +1,10 @@
 /* global Hammer */
-import BaseTableCell from '../-private/base-table-cell';
 import { next } from '@ember/runloop';
-
+import { get, action } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
-import { closest } from '../../-private/utils/element';
 
-import layout from './template';
-import { get, action } from '@ember/object';
+import BaseTableCell from './-private/base-table-cell';
+import { closest } from '../-private/utils/element';
 
 const COLUMN_INACTIVE = 0;
 const COLUMN_RESIZING = 1;
@@ -35,7 +33,6 @@ const COLUMN_REORDERING = 2;
   @public
 */
 export default BaseTableCell.extend({
-  layout,
   tagName: 'th',
   attributeBindings: ['columnSpan:colspan', 'rowSpan:rowspan'],
   classNameBindings: ['isSortable', 'isResizable', 'isReorderable'],
diff --git a/addon/components/ember-th/resize-handle.hbs b/addon/components/ember-th/resize-handle.hbs
diff --git a/addon/components/ember-th/resize-handle.js b/addon/components/ember-th/resize-handle.js
@@ -1,6 +1,4 @@
 import Component from '@ember/component';
-import layout from './template';
-
 import { readOnly } from '@ember/object/computed';
 
 /**
@@ -25,7 +23,6 @@ import { readOnly } from '@ember/object/computed';
   @public
 */
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-th/sort-indicator.hbs b/addon/components/ember-th/sort-indicator.hbs
diff --git a/addon/components/ember-th/sort-indicator.js b/addon/components/ember-th/sort-indicator.js
@@ -1,6 +1,4 @@
 import Component from '@ember/component';
-import layout from './template';
-
 import { readOnly } from '@ember/object/computed';
 
 /**
@@ -26,7 +24,6 @@ import { readOnly } from '@ember/object/computed';
 */
 
 export default Component.extend({
-  layout,
   tagName: '',
 
   /**
diff --git a/addon/components/ember-thead.hbs b/addon/components/ember-thead.hbs
diff --git a/addon/components/ember-thead.js b/addon/components/ember-thead.js
@@ -1,22 +1,19 @@
 /* global ResizeSensor */
-import Component from '@ember/component';
-import { bind } from '@ember/runloop';
 import { A as emberA } from '@ember/array';
+import Component from '@ember/component';
 import { assert } from '@ember/debug';
-import defaultTo from '../../-private/utils/default-to';
-import { addObserver } from '../../-private/utils/observer';
 import EmberObject, { computed, get } from '@ember/object';
 import { and, notEmpty, or } from '@ember/object/computed';
+import { bind, scheduleOnce } from '@ember/runloop';
 import { isPresent } from '@ember/utils';
 
-import { closest } from '../../-private/utils/element';
-import MetaCache from '../../-private/meta-cache';
-import { sortMultiple, compareValues } from '../../-private/utils/sort';
-import { scheduleOnce } from '@ember/runloop';
-
-import ColumnTree, { RESIZE_MODE, FILL_MODE, WIDTH_CONSTRAINT } from '../../-private/column-tree';
+import MetaCache from '../-private/meta-cache';
+import defaultTo from '../-private/utils/default-to';
+import { closest } from '../-private/utils/element';
+import { addObserver } from '../-private/utils/observer';
+import { sortMultiple, compareValues } from '../-private/utils/sort';
 
-import layout from './template';
+import ColumnTree, { RESIZE_MODE, FILL_MODE, WIDTH_CONSTRAINT } from '../-private/column-tree';
 
 let isTestingThead = false;
 export function setupTHeadForTest(bool) {
@@ -45,7 +42,6 @@ export function setupTHeadForTest(bool) {
 */
 
 export default Component.extend({
-  layout,
   tagName: 'thead',
 
   /**
diff --git a/addon/components/ember-tr.hbs b/addon/components/ember-tr.hbs
diff --git a/addon/components/ember-tr.js b/addon/components/ember-tr.js
@@ -2,10 +2,8 @@ import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
 
-import { closest } from '../../-private/utils/element';
-
-import layout from './template';
-import { SELECT_MODE } from '../../-private/collapse-tree';
+import { SELECT_MODE } from '../-private/collapse-tree';
+import { closest } from '../-private/utils/element';
 
 /**
   The table row component. This component manages row level concerns, and yields
@@ -45,7 +43,6 @@ import { SELECT_MODE } from '../../-private/collapse-tree';
   @public
 */
 export default Component.extend({
-  layout,
   tagName: 'tr',
   classNames: ['et-tr'],
   classNameBindings: ['isEven:is-even:is-odd', 'isGroupSelected', 'isSelectable', 'isSelected'],
diff --git a/app/components/ember-table-loading-more.js b/app/components/ember-table-loading-more.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-table-loading-more/component';
+export { default } from 'ember-table/components/ember-table-loading-more';
diff --git a/app/components/ember-table-private/scroll-indicators.js b/app/components/ember-table-private/scroll-indicators.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/-private/scroll-indicators/component';
+export { default } from 'ember-table/components/-private/scroll-indicators';
diff --git a/app/components/ember-table.js b/app/components/ember-table.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-table/component';
+export { default } from 'ember-table/components/ember-table';
diff --git a/app/components/ember-tbody.js b/app/components/ember-tbody.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tbody/component';
+export { default } from 'ember-table/components/ember-tbody';
diff --git a/app/components/ember-td.js b/app/components/ember-td.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-td/component';
+export { default } from 'ember-table/components/ember-td';
diff --git a/app/components/ember-tfoot.js b/app/components/ember-tfoot.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tfoot/component';
+export { default } from 'ember-table/components/ember-tfoot';
diff --git a/app/components/ember-th.js b/app/components/ember-th.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/component';
+export { default } from 'ember-table/components/ember-th';
diff --git a/app/components/ember-th/resize-handle.js b/app/components/ember-th/resize-handle.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/resize-handle/component';
+export { default } from 'ember-table/components/ember-th/resize-handle';
diff --git a/app/components/ember-th/sort-indicator.js b/app/components/ember-th/sort-indicator.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-th/sort-indicator/component';
+export { default } from 'ember-table/components/ember-th/sort-indicator';
diff --git a/app/components/ember-thead.js b/app/components/ember-thead.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-thead/component';
+export { default } from 'ember-table/components/ember-thead';
diff --git a/app/components/ember-tr.js b/app/components/ember-tr.js
@@ -1 +1 @@
-export { default } from 'ember-table/components/ember-tr/component';
+export { default } from 'ember-table/components/ember-tr';
diff --git a/tests/dummy/app/components/custom-row/component.js b/tests/dummy/app/components/custom-row/component.js
@@ -1,4 +1,4 @@
-import EmberTableRow from 'ember-table/components/ember-tr/component';
+import EmberTableRow from 'ember-table/components/ember-tr';
 
 export default EmberTableRow.extend({
   classNames: ['custom-row'],
diff --git a/types/components/ember-table/component.d.ts b/types/components/ember-table/component.d.ts
@@ -1,9 +1,9 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow } from 'ember-table';
-import EmberTbodyComponent from 'ember-table/components/ember-tbody/component';
-import EmberTfootComponent from 'ember-table/components/ember-tfoot/component';
-import EmberTheadComponent from 'ember-table/components/ember-thead/component';
-import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more/component';
+import EmberTbodyComponent from 'ember-table/components/ember-tbody';
+import EmberTfootComponent from 'ember-table/components/ember-tfoot';
+import EmberTheadComponent from 'ember-table/components/ember-thead';
+import EmberTableLoadingMoreComponent from 'ember-table/components/ember-table-loading-more';
 
 export interface EmberTableSignature<
   RowType extends EmberTableRow,
diff --git a/types/components/ember-tbody/component.d.ts b/types/components/ember-tbody/component.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow, TableRowMeta } from 'ember-table';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 type SelectionMode =
   | 'multiple'
diff --git a/types/components/ember-tfoot/component.d.ts b/types/components/ember-tfoot/component.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn,  EmberTableRow, TableRowMeta } from 'ember-table';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 export interface EmberTfootSignature<
   RowType extends EmberTableRow,
diff --git a/types/components/ember-thead/component.d.ts b/types/components/ember-thead/component.d.ts
@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow, EmberTableSort } from 'ember-table';
-import EmberThComponent from 'ember-table/components/ember-th/component';
-import EmberTrComponent from 'ember-table/components/ember-tr/component';
+import EmberThComponent from 'ember-table/components/ember-th';
+import EmberTrComponent from 'ember-table/components/ember-tr';
 
 type FillMode =
   | 'equal-column'
diff --git a/types/components/ember-tr/component.d.ts b/types/components/ember-tr/component.d.ts
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { EmberTableColumn, EmberTableRow, TableColumnMeta, TableRowMeta } from 'ember-table';
-import EmberTdComponent from 'ember-table/components/ember-td/component';
+import EmberTdComponent from 'ember-table/components/ember-td';
 
 export interface EmberTrSignature<
   RowType extends EmberTableRow,
diff --git a/types/template-registry.d.ts b/types/template-registry.d.ts
@@ -1,6 +1,6 @@
-import EmberTableComponent from 'ember-table/components/ember-table/component';
-import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle/component';
-import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator/component';
+import EmberTableComponent from 'ember-table/components/ember-table';
+import ResizeHandleComponent from 'ember-table/components/ember-th/resize-handle';
+import SortIndicatorComponent from 'ember-table/components/ember-th/sort-indicator';
 
 export default interface Registry {
   EmberTable: typeof EmberTableComponent;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import Component from '@ember/component';`
	`2`	`+`
`2`	`3`	`import defaultTo from '../-private/utils/default-to';`
`3`	`4`
`4`	`5`	`export default Component.extend({`