diff --git a/packages/devextreme/js/__internal/grids/data_grid/data_source_adapter.ts b/packages/devextreme/js/__internal/grids/data_grid/data_source_adapter.ts index 25e4c5c9baa9..9bbe0c635eb7 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/data_source_adapter.ts @@ -1,4 +1,4 @@ -import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import { createDataSourceAdapterProvider } from '@ts/grids/grid_core/data_source_adapter/provider'; export default createDataSourceAdapterProvider(DataSourceAdapter); diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts index 5045bae443a2..1e336c2736b9 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts @@ -7,7 +7,7 @@ import { getHeight } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { restoreFocus, setTabIndex } from '@js/ui/shared/accessibility'; import { ColumnContextMenuMixin } from '@ts/grids/grid_core/context_menu/m_column_context_menu_mixin'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import { registerKeyboardAction } from '@ts/grids/grid_core/m_accessibility'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts index 6ac6b5114275..f1743830c9bd 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts @@ -3,7 +3,7 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import errors from '@js/ui/widget/ui.errors'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import { combineFilters } from '@ts/grids/grid_core/filter/utils'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts index 7130acec3955..c2cf11568d31 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts @@ -5,7 +5,7 @@ import { toComparable } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import { combineFilters } from '@ts/grids/grid_core/filter/utils'; import dataGridCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index 8ad212475418..09b2e1504c3a 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -9,7 +9,7 @@ import { isDefined, isPlainObject } from '@js/core/utils/type'; import type { GroupData } from '@js/ui/data_grid'; import type { DataSource } from '@ts/data/data_source/data_source'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { RawItemData, RemoteOperationsOptions } from '@ts/grids/grid_core/data_source_adapter/types'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { ColumnsView } from '@ts/grids/grid_core/views/columns_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts index 2600cc19a550..31c5133c6143 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts @@ -7,7 +7,7 @@ import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { ColumnsController } from '../../columns_controller/columns_controller'; import type { DataController } from '../../data_controller/data_controller'; import type { DataSourceController } from '../../data_source/data_source_controller'; -import type DataSourceAdapter from '../../data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '../../data_source_adapter/data_source_adapter'; import type { ChangedEvent, RawItemData } from '../../data_source_adapter/types'; import gridCoreUtils from '../../m_utils'; import { Controller } from '../../modules/modules'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts index cea09a50ca78..d26057090f0d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts @@ -47,7 +47,7 @@ import type { SavedColumnState, WithCellValueCalculator, } from '@ts/grids/grid_core/columns_controller/types'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import type { DataFilter } from '@ts/grids/grid_core/filter/types'; import type { Module } from '@ts/grids/grid_core/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts index c5a8eb3e7b8d..d93924f36d9f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts @@ -18,7 +18,7 @@ import errors from '@js/ui/widget/ui.errors'; import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_headers/const'; import { AI_COLUMN_NAME } from '../ai_column/const'; -import type DataSourceAdapter from '../data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '../data_source_adapter/data_source_adapter'; import type { RawItemData } from '../data_source_adapter/types'; import gridCoreUtils from '../m_utils'; import { StickyPosition } from '../sticky_columns/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts index c62de5473f27..b1f258724821 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts @@ -12,7 +12,7 @@ import type { DataSource } from '@ts/data/data_source/data_source'; import type { ChangingEvent } from '@ts/data/data_source/types'; import type { Column, ColumnsChanges } from '@ts/grids/grid_core/columns_controller/types'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { ChangedEvent, LoadOperation, OperationTypes, RawItemData, } from '@ts/grids/grid_core/data_source_adapter/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source/__tests__/data_source_controller.test.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source/__tests__/data_source_controller.test.ts index bc2bae075c50..af7d7a224c0c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source/__tests__/data_source_controller.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source/__tests__/data_source_controller.test.ts @@ -11,7 +11,7 @@ import type { StoreChange } from '@js/data/store'; import type Store from '@ts/data/abstract_store'; import type { StoreKey } from '@ts/data/abstract_store'; import type { DataSource } from '@ts/data/data_source/data_source'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { DataSourceAdapterProvider, RawItemData, RemoteOperationsOptions, } from '@ts/grids/grid_core/data_source_adapter/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source/data_source_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source/data_source_controller.ts index 9dbb3115e6dc..054d59e0011f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source/data_source_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source/data_source_controller.ts @@ -7,7 +7,7 @@ import type Store from '@ts/data/abstract_store'; import type { StoreKey } from '@ts/data/abstract_store'; import type { DataSource } from '@ts/data/data_source/data_source'; import type { StoreLoadOptions } from '@ts/data/data_source/types'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { DataSourceAdapterProvider, LastLoadOptions, OperationTypes, RawItemData, RemoteOperationsOptions, } from '@ts/grids/grid_core/data_source_adapter/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/custom_loader.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/custom_loader.ts index 6805a43eaddb..28d037955c43 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/custom_loader.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/custom_loader.ts @@ -4,7 +4,7 @@ import { extend } from '@js/core/utils/extend'; import type { DataSource } from '@ts/data/data_source/data_source'; import type { StoreLoadOptions } from '@ts/data/data_source/types'; -import { executeTask } from './m_data_source_adapter_utils'; +import { executeTask } from './data_source_adapter_utils'; import type { LoadOperation, RawItemData } from './types'; export type CustomStoreLoadOptions = StoreLoadOptions & { isLoadingAll?: boolean }; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts rename to packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts index a845c1391681..1618c4af7ab7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts @@ -27,7 +27,7 @@ import { createEmptyCachedData, getPageDataFromCache, setPageDataToCache, -} from './m_data_source_adapter_utils'; +} from './data_source_adapter_utils'; import type { ChangedEvent, LastLoadOptions, diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter_utils.ts rename to packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/provider.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/provider.ts index e6cf4d41d757..d369a7ec46ed 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/provider.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/provider.ts @@ -1,5 +1,5 @@ import type { ModuleType } from '../types'; -import type DataSourceAdapter from './m_data_source_adapter'; +import type DataSourceAdapter from './data_source_adapter'; import type { DataSourceAdapterProvider } from './types'; export function createDataSourceAdapterProvider( diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/types.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/types.ts index a223c593a999..6ba0b1159f0a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/types.ts @@ -8,7 +8,7 @@ import type { } from '@ts/data/data_source/types'; import type { InternalGrid, ModuleType } from '../types'; -import type DataSourceAdapter from './m_data_source_adapter'; +import type DataSourceAdapter from './data_source_adapter'; export type RawItemData = Record; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts index 806c1eca175d..e907c9f36246 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts @@ -26,7 +26,7 @@ import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { ColumnPoint, SelectionRange } from '@ts/grids/grid_core/types'; import { AI_COLUMN_NAME } from './ai_column/const'; -import type DataSourceAdapter from './data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from './data_source_adapter/data_source_adapter'; import { combineFilters } from './filter/utils'; import { isEqualSelectors, isSelectorEqualWithCallback } from './utils/index'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_data_loader/m_virtual_data_loader.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_data_loader/virtual_data_loader.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/virtual_data_loader/m_virtual_data_loader.ts rename to packages/devextreme/js/__internal/grids/grid_core/virtual_data_loader/virtual_data_loader.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts index b2d04eca82eb..8223f49ae8db 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts @@ -13,7 +13,7 @@ import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_handling/error_handling_view_controller'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts index 5c5b0a6972d0..12b19302c20d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts @@ -13,7 +13,7 @@ import type { } from '@ts/grids/grid_core/virtual_data_loader/types'; import gridCoreUtils from '../m_utils'; -import { VirtualDataLoader } from '../virtual_data_loader/m_virtual_data_loader'; +import { VirtualDataLoader } from '../virtual_data_loader/virtual_data_loader'; const SCROLLING_MODE_INFINITE = 'infinite'; const SCROLLING_MODE_VIRTUAL = 'virtual'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/columns_controller.ts b/packages/devextreme/js/__internal/grids/tree_list/columns_controller.ts index 111139616973..1cf976780282 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/columns_controller.ts @@ -1,6 +1,6 @@ import { isDefined } from '@js/core/utils/type'; import { ColumnsController, columnsControllerModule } from '@ts/grids/grid_core/columns_controller/columns_controller'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import treeListCore from './core'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/tree_list/data_controller/data_controller.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts rename to packages/devextreme/js/__internal/grids/tree_list/data_controller/data_controller.ts index 41d6564e499a..4caf0a62ebbf 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_controller/data_controller.ts @@ -221,7 +221,6 @@ export class TreeListDataController extends DataController { treeListCore.registerModule('data', { defaultOptions() { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return -- extend() returns any return extend({}, dataControllerModule.defaultOptions?.(), { itemsExpr: 'items', parentIdExpr: 'parentId', diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source/data_source_controller.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source/data_source_controller.ts index ecb969670194..1c2b6eb83884 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source/data_source_controller.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source/data_source_controller.ts @@ -2,8 +2,8 @@ import type { StoreKey } from '@ts/data/abstract_store'; import { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; import type { DataSourceAdapterProvider, RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import type { RowKey } from '@ts/grids/grid_core/types'; -import type { DataSourceAdapterTreeList } from '@ts/grids/tree_list/data_source_adapter/m_data_source_adapter'; -import dataSourceAdapterProvider from '@ts/grids/tree_list/data_source_adapter/m_data_source_adapter'; +import type { DataSourceAdapterTreeList } from '@ts/grids/tree_list/data_source_adapter/data_source_adapter'; +import dataSourceAdapterProvider from '@ts/grids/tree_list/data_source_adapter/data_source_adapter'; export class TreeListDataSourceController extends DataSourceController { diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.test.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.test.ts index 849a62a8e0cf..948e3fd2fd49 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.test.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.test.ts @@ -8,7 +8,7 @@ import { DataSource } from '@ts/data/data_source/data_source'; import type { CustomLoadResult } from '@ts/grids/grid_core/data_source_adapter/custom_loader'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; -import { DataSourceAdapterTreeList } from './m_data_source_adapter'; +import { DataSourceAdapterTreeList } from './data_source_adapter'; import type { TreeNode } from './types'; import type { LoadBranchesContext } from './utils/load_branches'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts rename to packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts index 5d8b9820f2e5..c6e288877ee7 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts @@ -12,7 +12,7 @@ import type Store from '@ts/data/abstract_store'; import type { DataSource } from '@ts/data/data_source/data_source'; import type { ChangingEvent, StoreLoadOptions } from '@ts/data/data_source/types'; import type { BeforePushEvent } from '@ts/data/types'; -import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import { createDataSourceAdapterProvider } from '@ts/grids/grid_core/data_source_adapter/provider'; import type { OperationTypes as BaseOperationTypes, RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts index 8a6cfd27be4c..664a712f6a4a 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts @@ -15,7 +15,7 @@ import type { ModuleType } from '@ts/grids/grid_core/types'; import type { RowsView } from '../../grid_core/views/m_rows_view'; import treeListCore from '../core'; -import type { TreeListDataController } from '../data_controller/m_data_controller'; +import type { TreeListDataController } from '../data_controller/data_controller'; import type { TreeListDataSourceController } from '../data_source/data_source_controller'; const TREELIST_EXPAND_ICON_CONTAINER_CLASS = 'dx-treelist-icon-container'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts index 5f204a1adf1d..727fccbe4978 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts @@ -2,7 +2,7 @@ import { extend } from '@js/core/utils/extend'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; -import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; +import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; @@ -15,7 +15,7 @@ import { } from '@ts/grids/grid_core/virtual_scrolling/index'; import gridCore from './core'; -import dataSourceAdapterProvider from './data_source_adapter/m_data_source_adapter'; +import dataSourceAdapterProvider from './data_source_adapter/data_source_adapter'; const oldDefaultOptions = virtualScrollingModule.defaultOptions; diff --git a/packages/devextreme/js/__internal/grids/tree_list/m_widget_base.ts b/packages/devextreme/js/__internal/grids/tree_list/m_widget_base.ts index 5c97ddedf01b..a491649d867d 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/m_widget_base.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/m_widget_base.ts @@ -2,7 +2,7 @@ import './module_not_extended/column_headers'; import './columns_controller'; import './data_source/data_source_module'; import './module_not_extended/filter'; -import './data_controller/m_data_controller'; +import './data_controller/data_controller'; import './module_not_extended/sorting'; import './rows/m_rows'; import './module_not_extended/context_menu';