diff --git a/packages/devextreme/js/__internal/core/environment/init_mobile_viewport.ts b/packages/devextreme/js/__internal/core/environment/init_mobile_viewport.ts index 1d9d8c6f3a8a..0af01832ebb1 100644 --- a/packages/devextreme/js/__internal/core/environment/init_mobile_viewport.ts +++ b/packages/devextreme/js/__internal/core/environment/init_mobile_viewport.ts @@ -2,11 +2,11 @@ import $ from '@js/core/renderer'; import devices from '@ts/core/devices'; import domAdapter from '@ts/core/dom_adapter'; import { extend } from '@ts/core/utils/m_extend'; -import resizeCallbacks from '@ts/core/utils/m_resize_callbacks'; import { getWidth, setWidth } from '@ts/core/utils/m_size'; -import { styleProp } from '@ts/core/utils/m_style'; import supportUtils from '@ts/core/utils/m_support'; import { getWindow } from '@ts/core/utils/m_window'; +import resizeCallbacks from '@ts/core/utils/resize_callbacks'; +import { styleProp } from '@ts/core/utils/style'; import eventsEngine from '@ts/events/core/events_engine'; import type { ScrollEvent } from '@ts/events/gesture/emitter.gesture.scroll'; diff --git a/packages/devextreme/js/__internal/core/events_strategy.ts b/packages/devextreme/js/__internal/core/events_strategy.ts index 8b4aec778a18..2462249c0d3a 100644 --- a/packages/devextreme/js/__internal/core/events_strategy.ts +++ b/packages/devextreme/js/__internal/core/events_strategy.ts @@ -1,6 +1,6 @@ import { each } from '@js/core/utils/iterator'; import { isFunction, isPlainObject } from '@js/core/utils/type'; -import { Callbacks } from '@ts/core/utils/m_callbacks'; +import { Callbacks } from '@ts/core/utils/callbacks'; export type EventHandler = Function; diff --git a/packages/devextreme/js/__internal/core/localization/message.ts b/packages/devextreme/js/__internal/core/localization/message.ts index bd0cc961685e..a9c0a5ebf026 100644 --- a/packages/devextreme/js/__internal/core/localization/message.ts +++ b/packages/devextreme/js/__internal/core/localization/message.ts @@ -1,9 +1,9 @@ import coreLocalization from '@ts/core/localization/core'; import { defaultMessages } from '@ts/core/localization/default_messages'; import { injector as dependencyInjector } from '@ts/core/utils/dependency_injector'; +import { humanize } from '@ts/core/utils/inflector'; import { extend } from '@ts/core/utils/m_extend'; -import { humanize } from '@ts/core/utils/m_inflector'; -import { format as stringFormat } from '@ts/core/utils/m_string'; +import { format as stringFormat } from '@ts/core/utils/string'; export type MessageFormatter = (...values: unknown[]) => string; export type MessageDictionary = Record>; diff --git a/packages/devextreme/js/__internal/core/memorized_callbacks.ts b/packages/devextreme/js/__internal/core/memorized_callbacks.ts index 8fb89d0b6d33..4ce2a5a73b8b 100644 --- a/packages/devextreme/js/__internal/core/memorized_callbacks.ts +++ b/packages/devextreme/js/__internal/core/memorized_callbacks.ts @@ -1,7 +1,7 @@ import Callbacks from '@js/core/utils/callbacks'; import { each } from '@js/core/utils/iterator'; -import type { CallbackInterface } from './utils/m_callbacks'; +import type { CallbackInterface } from './utils/callbacks'; type MemorizedHandler = Parameters[0]; diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_comparator.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/comparator.test.ts similarity index 97% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_comparator.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/comparator.test.ts index 9ea9dc7e43a7..8c57acc9bd75 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_comparator.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/comparator.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from '@jest/globals'; import $ from '@js/core/renderer'; -import { equals } from '@ts/core/utils/m_comparator'; +import { equals } from '@ts/core/utils/comparator'; describe('Comparator utils', () => { describe('equals', () => { diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_error.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/error.test.ts similarity index 99% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_error.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/error.test.ts index a91aa73da817..2f5d9f51ae16 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_error.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/error.test.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it, jest, } from '@jest/globals'; +import errorFactory from '@ts/core/utils/error'; import consoleUtils from '@ts/core/utils/m_console'; -import errorFactory from '@ts/core/utils/m_error'; jest.mock('@ts/core/utils/m_console', () => { const logger = { diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_html_parser.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/html_parser.test.ts similarity index 97% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_html_parser.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/html_parser.test.ts index 6d530420a5b4..bcfc4b11c361 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_html_parser.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/html_parser.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from '@jest/globals'; -import { isTablePart, parseHTML } from '@ts/core/utils/m_html_parser'; +import { isTablePart, parseHTML } from '@ts/core/utils/html_parser'; const tableParts: [string, string][] = [ ['tr', '1'], diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_public_component.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/public_component.test.ts similarity index 99% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_public_component.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/public_component.test.ts index 15c435d51508..e5d9eab14998 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_public_component.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/public_component.test.ts @@ -5,7 +5,7 @@ import { attachInstanceToElement, getInstanceByElement, name as getComponentName, -} from '@ts/core/utils/m_public_component'; +} from '@ts/core/utils/public_component'; const ANONYMOUS_NAME = /^dxPrivateComponent(\d+)$/; diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_selection_filter.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/selection_filter.test.ts similarity index 99% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_selection_filter.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/selection_filter.test.ts index afb205a1b4bc..90919770ad87 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_selection_filter.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/selection_filter.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from '@jest/globals'; -import { SelectionFilterCreator } from '@ts/core/utils/m_selection_filter'; +import { SelectionFilterCreator } from '@ts/core/utils/selection_filter'; const createFilter = ( keys: unknown[], diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_shadow_dom.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/shadow_dom.test.ts similarity index 99% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_shadow_dom.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/shadow_dom.test.ts index 9d0a815033c7..3243e41191ab 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_shadow_dom.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/shadow_dom.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, jest, } from '@jest/globals'; import type { dxElementWrapper } from '@js/core/renderer'; -import { computeStyleSheetsHash, getShadowElementsFromPoint } from '@ts/core/utils/m_shadow_dom'; +import { computeStyleSheetsHash, getShadowElementsFromPoint } from '@ts/core/utils/shadow_dom'; const createSheet = (rules: string[] | 'cross-origin'): CSSStyleSheet => ({ get cssRules() { @@ -269,12 +269,12 @@ describe('Shadow DOM utils', () => { const createRoot = (sheets: CSSStyleSheet[]): FakeRoot => ({ host: {}, styleSheets: sheets }); - type ShadowDomModule = typeof import('@ts/core/utils/m_shadow_dom'); + type ShadowDomModule = typeof import('@ts/core/utils/shadow_dom'); const load = (): ShadowDomModule => { jest.resetModules(); - return jest.requireActual('@ts/core/utils/m_shadow_dom'); + return jest.requireActual('@ts/core/utils/shadow_dom'); }; const getTexts = (sheet: FakeStyleSheet): string[] => ( diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_storage.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/storage.test.ts similarity index 94% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_storage.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/storage.test.ts index e98da00b4b65..d044b4b3c64b 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_storage.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/storage.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, } from '@jest/globals'; -import { sessionStorage } from '@ts/core/utils/m_storage'; +import { sessionStorage } from '@ts/core/utils/storage'; describe('Storage utils', () => { describe('sessionStorage', () => { diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_style.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/style.test.ts similarity index 97% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_style.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/style.test.ts index 35cca51c2bec..1de5a65b0188 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_style.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/style.test.ts @@ -8,9 +8,9 @@ import { setHeight, setStyle, setWidth, -} from '@ts/core/utils/m_style'; +} from '@ts/core/utils/style'; -type StyleModule = typeof import('@ts/core/utils/m_style'); +type StyleModule = typeof import('@ts/core/utils/style'); const createRealElement = document.createElement.bind(document) as (tagName: string) => HTMLElement; @@ -23,7 +23,7 @@ const loadStyleModule = (supportedProps: Record): StyleModule => )) as typeof document.createElement, ); - return jest.requireActual('@ts/core/utils/m_style'); + return jest.requireActual('@ts/core/utils/style'); }; describe('Style utils', () => { diff --git a/packages/devextreme/js/__internal/core/utils/__tests__/m_svg.test.ts b/packages/devextreme/js/__internal/core/utils/__tests__/svg.test.ts similarity index 99% rename from packages/devextreme/js/__internal/core/utils/__tests__/m_svg.test.ts rename to packages/devextreme/js/__internal/core/utils/__tests__/svg.test.ts index 176393954fca..acd2a1609ba3 100644 --- a/packages/devextreme/js/__internal/core/utils/__tests__/m_svg.test.ts +++ b/packages/devextreme/js/__internal/core/utils/__tests__/svg.test.ts @@ -2,7 +2,7 @@ import { afterEach, describe, expect, it, jest, } from '@jest/globals'; import $ from '@js/core/renderer'; -import { getSvgElement, getSvgMarkup, HIDDEN_FOR_EXPORT } from '@ts/core/utils/m_svg'; +import { getSvgElement, getSvgMarkup, HIDDEN_FOR_EXPORT } from '@ts/core/utils/svg'; const SVG_NS = 'http://www.w3.org/2000/svg'; const XLINK_NS = 'http://www.w3.org/1999/xlink'; diff --git a/packages/devextreme/js/__internal/core/utils/m_callbacks.ts b/packages/devextreme/js/__internal/core/utils/callbacks.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_callbacks.ts rename to packages/devextreme/js/__internal/core/utils/callbacks.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_comparator.ts b/packages/devextreme/js/__internal/core/utils/comparator.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_comparator.ts rename to packages/devextreme/js/__internal/core/utils/comparator.ts diff --git a/packages/devextreme/js/__internal/core/utils/document_size_callbacks.ts b/packages/devextreme/js/__internal/core/utils/document_size_callbacks.ts index a9fcb7f7015d..2bfd59f02adf 100644 --- a/packages/devextreme/js/__internal/core/utils/document_size_callbacks.ts +++ b/packages/devextreme/js/__internal/core/utils/document_size_callbacks.ts @@ -1,5 +1,5 @@ import domAdapter from '@js/core/dom_adapter'; -import { Callbacks } from '@ts/core/utils/m_callbacks'; +import { Callbacks } from '@ts/core/utils/callbacks'; import windowUtils from '@ts/core/utils/m_window'; interface Size { diff --git a/packages/devextreme/js/__internal/core/utils/m_error.ts b/packages/devextreme/js/__internal/core/utils/error.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_error.ts rename to packages/devextreme/js/__internal/core/utils/error.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_html_parser.ts b/packages/devextreme/js/__internal/core/utils/html_parser.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_html_parser.ts rename to packages/devextreme/js/__internal/core/utils/html_parser.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_icon.ts b/packages/devextreme/js/__internal/core/utils/icon.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_icon.ts rename to packages/devextreme/js/__internal/core/utils/icon.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_inflector.ts b/packages/devextreme/js/__internal/core/utils/inflector.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_inflector.ts rename to packages/devextreme/js/__internal/core/utils/inflector.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_position.ts b/packages/devextreme/js/__internal/core/utils/position.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_position.ts rename to packages/devextreme/js/__internal/core/utils/position.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_public_component.ts b/packages/devextreme/js/__internal/core/utils/public_component.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_public_component.ts rename to packages/devextreme/js/__internal/core/utils/public_component.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_queue.ts b/packages/devextreme/js/__internal/core/utils/queue.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_queue.ts rename to packages/devextreme/js/__internal/core/utils/queue.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_ready_callbacks.ts b/packages/devextreme/js/__internal/core/utils/ready_callbacks.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_ready_callbacks.ts rename to packages/devextreme/js/__internal/core/utils/ready_callbacks.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_resize_callbacks.ts b/packages/devextreme/js/__internal/core/utils/resize_callbacks.ts similarity index 95% rename from packages/devextreme/js/__internal/core/utils/m_resize_callbacks.ts rename to packages/devextreme/js/__internal/core/utils/resize_callbacks.ts index 2accf3e31900..9da3b55c1bc6 100644 --- a/packages/devextreme/js/__internal/core/utils/m_resize_callbacks.ts +++ b/packages/devextreme/js/__internal/core/utils/resize_callbacks.ts @@ -1,11 +1,11 @@ import domAdapter from '@js/core/dom_adapter'; import { callOnce } from '@ts/core/utils/call_once'; -import type { CallbackInterface } from './m_callbacks'; +import type { CallbackInterface } from './callbacks'; // eslint-disable-next-line import/no-named-as-default -import Callbacks from './m_callbacks'; -import readyCallbacks from './m_ready_callbacks'; +import Callbacks from './callbacks'; import windowModule from './m_window'; +import readyCallbacks from './ready_callbacks'; interface Size { width: number; diff --git a/packages/devextreme/js/__internal/core/utils/m_selection_filter.ts b/packages/devextreme/js/__internal/core/utils/selection_filter.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_selection_filter.ts rename to packages/devextreme/js/__internal/core/utils/selection_filter.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_selectors.ts b/packages/devextreme/js/__internal/core/utils/selectors.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_selectors.ts rename to packages/devextreme/js/__internal/core/utils/selectors.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_shadow_dom.ts b/packages/devextreme/js/__internal/core/utils/shadow_dom.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_shadow_dom.ts rename to packages/devextreme/js/__internal/core/utils/shadow_dom.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_storage.ts b/packages/devextreme/js/__internal/core/utils/storage.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_storage.ts rename to packages/devextreme/js/__internal/core/utils/storage.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_string.ts b/packages/devextreme/js/__internal/core/utils/string.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_string.ts rename to packages/devextreme/js/__internal/core/utils/string.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_style.ts b/packages/devextreme/js/__internal/core/utils/style.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_style.ts rename to packages/devextreme/js/__internal/core/utils/style.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_svg.ts b/packages/devextreme/js/__internal/core/utils/svg.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_svg.ts rename to packages/devextreme/js/__internal/core/utils/svg.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_variable_wrapper.ts b/packages/devextreme/js/__internal/core/utils/variable_wrapper.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_variable_wrapper.ts rename to packages/devextreme/js/__internal/core/utils/variable_wrapper.ts diff --git a/packages/devextreme/js/__internal/core/utils/m_view_port.ts b/packages/devextreme/js/__internal/core/utils/view_port.ts similarity index 100% rename from packages/devextreme/js/__internal/core/utils/m_view_port.ts rename to packages/devextreme/js/__internal/core/utils/view_port.ts diff --git a/packages/devextreme/js/__internal/core/widget/widget.ts b/packages/devextreme/js/__internal/core/widget/widget.ts index af9921801e1a..254d95db1f73 100644 --- a/packages/devextreme/js/__internal/core/widget/widget.ts +++ b/packages/devextreme/js/__internal/core/widget/widget.ts @@ -22,7 +22,7 @@ import type { PointerInteractionEvent, } from '@js/events'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; -import { focusable as focusableSelector } from '@ts/core/utils/m_selectors'; +import { focusable as focusableSelector } from '@ts/core/utils/selectors'; import type { DOMComponentProperties } from '@ts/core/widget/dom_component'; import DOMComponent from '@ts/core/widget/dom_component'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/data/errors.ts b/packages/devextreme/js/__internal/data/errors.ts index 0f6be8758e3b..3b7773e8d260 100644 --- a/packages/devextreme/js/__internal/data/errors.ts +++ b/packages/devextreme/js/__internal/data/errors.ts @@ -1,7 +1,7 @@ import coreErrors from '@js/core/errors'; import errorUtils from '@js/core/utils/error'; import { isObject } from '@js/core/utils/type'; -import type { DxError } from '@ts/core/utils/m_error'; +import type { DxError } from '@ts/core/utils/error'; export const errors = errorUtils(coreErrors.ERROR_MESSAGES, { diff --git a/packages/devextreme/js/__internal/draggable.ts b/packages/devextreme/js/__internal/draggable.ts index ffcde759d23a..4781b2624731 100644 --- a/packages/devextreme/js/__internal/draggable.ts +++ b/packages/devextreme/js/__internal/draggable.ts @@ -33,7 +33,7 @@ import type { Properties } from '@js/ui/draggable'; import { domAdapter } from '@ts/core/dom_adapter'; import { splitPair } from '@ts/core/utils/m_common'; import { fromPromise } from '@ts/core/utils/m_deferred'; -import type { Quad } from '@ts/core/utils/m_string'; +import type { Quad } from '@ts/core/utils/string'; import type { DefaultActionArgs } from '@ts/core/widget/component'; import DOMComponent from '@ts/core/widget/dom_component'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/events/core/emitter.ts b/packages/devextreme/js/__internal/events/core/emitter.ts index 47119567cd75..a09b71e893e0 100644 --- a/packages/devextreme/js/__internal/events/core/emitter.ts +++ b/packages/devextreme/js/__internal/events/core/emitter.ts @@ -4,7 +4,7 @@ import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { extend } from '@js/core/utils/extend'; import type { DxEvent, PointerInteractionEvent } from '@js/events'; -import type { CallbackInterface } from '@ts/core/utils/m_callbacks'; +import type { CallbackInterface } from '@ts/core/utils/callbacks'; export interface EmitterEventPointer { pageX: number; diff --git a/packages/devextreme/js/__internal/events/utils/index.ts b/packages/devextreme/js/__internal/events/utils/index.ts index 2b10f2a9c90f..a9af5f305e27 100644 --- a/packages/devextreme/js/__internal/events/utils/index.ts +++ b/packages/devextreme/js/__internal/events/utils/index.ts @@ -2,7 +2,7 @@ import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import mappedAddNamespace from './add_namespace'; /* eslint-disable spellcheck/spell-checker */ diff --git a/packages/devextreme/js/__internal/exporter/image_creator.ts b/packages/devextreme/js/__internal/exporter/image_creator.ts index cb89799d5e94..15d0e86d48ff 100644 --- a/packages/devextreme/js/__internal/exporter/image_creator.ts +++ b/packages/devextreme/js/__internal/exporter/image_creator.ts @@ -34,7 +34,7 @@ import { isDefined, isFunction, isPromise, isRenderer, } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import svgUtils from '@ts/core/utils/m_svg'; +import svgUtils from '@ts/core/utils/svg'; const window = getWindow(); diff --git a/packages/devextreme/js/__internal/exporter/svg_creator.ts b/packages/devextreme/js/__internal/exporter/svg_creator.ts index e4a3238e4daa..3458a834045d 100644 --- a/packages/devextreme/js/__internal/exporter/svg_creator.ts +++ b/packages/devextreme/js/__internal/exporter/svg_creator.ts @@ -13,7 +13,7 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import svgUtils from '@ts/core/utils/m_svg'; +import svgUtils from '@ts/core/utils/svg'; const window = getWindow(); diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller.integration.test.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller.integration.test.ts index 3cb72239ac64..1f00fee3672c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller.integration.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller.integration.test.ts @@ -3,7 +3,7 @@ import { } from '@jest/globals'; import type { Properties as DataGridProperties } from '@js/ui/data_grid'; import errors from '@js/ui/widget/ui.errors'; -import { variableWrapper } from '@ts/core/utils/m_variable_wrapper'; +import { variableWrapper } from '@ts/core/utils/variable_wrapper'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import type { InternalGrid } from '@ts/grids/grid_core/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller_utils.test.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller_utils.test.ts index 7b2bdcbbd1bd..8dd188150f4d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller_utils.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/__tests__/columns_controller_utils.test.ts @@ -6,7 +6,7 @@ import config from '@js/core/config'; import type { Properties as DataGridProperties } from '@js/ui/data_grid'; import errors from '@js/ui/widget/ui.errors'; import { AIIntegration } from '@ts/core/ai_integration/core/ai_integration'; -import { variableWrapper } from '@ts/core/utils/m_variable_wrapper'; +import { variableWrapper } from '@ts/core/utils/variable_wrapper'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; import { columnOptionCore, 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 84f4c90752d3..cea09a50ca78 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 @@ -21,7 +21,7 @@ import Store from '@js/data/abstract_store'; import type { Grouping, GroupPanel } from '@js/ui/data_grid'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; -import inflector from '@ts/core/utils/m_inflector'; +import inflector from '@ts/core/utils/inflector'; import type { SortingInfo } from '@ts/data/utils'; import type { BandColumnsCache, diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/types.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/types.ts index e7bace0b8ca4..29156e5b648f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/types.ts @@ -1,4 +1,4 @@ -import type { DxError } from '@ts/core/utils/m_error'; +import type { DxError } from '@ts/core/utils/error'; export interface ExternalError { message?: string; diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/utils.ts index 34c63d1d60ca..72983f45b743 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/utils.ts @@ -1,5 +1,5 @@ import { isObject } from '@js/core/utils/type'; -import type { DxError } from '@ts/core/utils/m_error'; +import type { DxError } from '@ts/core/utils/error'; import type { GridError } from './types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter_panel/m_filter_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/filter_panel/m_filter_panel.ts index aab0cf5ab199..62b2782ae4c5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter_panel/m_filter_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter_panel/m_filter_panel.ts @@ -7,7 +7,7 @@ import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred, when } from '@js/core/utils/deferred'; import { isDefined } from '@js/core/utils/type'; import CheckBox from '@js/ui/check_box'; -import inflector from '@ts/core/utils/m_inflector'; +import inflector from '@ts/core/utils/inflector'; import { getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText, getCustomOperation, getField, getGroupValue, isCondition, isGroup, diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts index 428bd04c6689..d42b4105801c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts @@ -23,7 +23,7 @@ import { import { isDeferred, isDefined, isEmptyObject } from '@js/core/utils/type'; import * as accessibility from '@js/ui/shared/accessibility'; import { isElementInDom } from '@ts/core/utils/m_dom'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import type { KeyboardKeyDownEvent } from '@ts/events/core/keyboard_processor'; import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; import { CLASSES as COLUMNS_CONTROLLER_CLASSES } from '@ts/grids/grid_core/columns_controller/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts index d41a9b2ebd30..6f9148d318a7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts @@ -25,7 +25,7 @@ import { current, isFluent } from '@js/ui/themes'; import ValidationEngine from '@js/ui/validation_engine'; import Validator from '@js/ui/validator'; import errors from '@js/ui/widget/ui.errors'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_handling/error_handling_view_controller'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts index b497c9d0fa9a..ff87d1b377a3 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts @@ -9,8 +9,8 @@ import { isString, } from '@js/core/utils/type'; import Store from '@js/data/abstract_store'; +import inflector from '@ts/core/utils/inflector'; import commonUtils from '@ts/core/utils/m_common'; -import inflector from '@ts/core/utils/m_inflector'; import { LocalStore } from '../local_store/m_local_store'; import { diff --git a/packages/devextreme/js/__internal/integration/jquery.ts b/packages/devextreme/js/__internal/integration/jquery.ts index d43ff3399ed7..15fd4455891b 100644 --- a/packages/devextreme/js/__internal/integration/jquery.ts +++ b/packages/devextreme/js/__internal/integration/jquery.ts @@ -1,5 +1,5 @@ /* eslint-disable import/first */ -import errors from '@ts/core/utils/m_error'; +import errors from '@ts/core/utils/error'; import { compare as compareVersions } from '@ts/core/utils/version'; // eslint-disable-next-line import/no-extraneous-dependencies import jQuery from 'jquery'; diff --git a/packages/devextreme/js/__internal/integration/jquery/hold_ready.ts b/packages/devextreme/js/__internal/integration/jquery/hold_ready.ts index 6bc03b008cc5..ec54aac3f71a 100644 --- a/packages/devextreme/js/__internal/integration/jquery/hold_ready.ts +++ b/packages/devextreme/js/__internal/integration/jquery/hold_ready.ts @@ -1,4 +1,4 @@ -import readyCallbacks from '@ts/core/utils/m_ready_callbacks'; +import readyCallbacks from '@ts/core/utils/ready_callbacks'; import { themeReadyCallback } from '@ts/ui/m_themes_callback'; // eslint-disable-next-line import/no-extraneous-dependencies import jQuery from 'jquery'; diff --git a/packages/devextreme/js/__internal/integration/knockout.ts b/packages/devextreme/js/__internal/integration/knockout.ts index 4d1f3d3ea267..9d2df0692b49 100644 --- a/packages/devextreme/js/__internal/integration/knockout.ts +++ b/packages/devextreme/js/__internal/integration/knockout.ts @@ -1,5 +1,5 @@ /* eslint-disable import/first */ -import errors from '@ts/core/utils/m_error'; +import errors from '@ts/core/utils/error'; import { compare as compareVersion } from '@ts/core/utils/version'; // eslint-disable-next-line import/no-extraneous-dependencies import ko from 'knockout'; diff --git a/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts b/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts index 782dd3d03c6a..56cbdef2765a 100644 --- a/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts +++ b/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts @@ -6,9 +6,9 @@ import { } from '@ts/core/component_registrator_callbacks'; import config from '@ts/core/config'; import { ComponentWrapper } from '@ts/core/r1/component_wrapper'; +import Callbacks from '@ts/core/utils/callbacks'; import type { Lock } from '@ts/core/utils/locker'; import { Locker } from '@ts/core/utils/locker'; -import Callbacks from '@ts/core/utils/m_callbacks'; import { isPlainObject } from '@ts/core/utils/m_type'; import Draggable from '@ts/draggable'; import Editor from '@ts/ui/editor/editor'; diff --git a/packages/devextreme/js/__internal/integration/knockout/components.ts b/packages/devextreme/js/__internal/integration/knockout/components.ts index 8b16145302a0..9eea87355a82 100644 --- a/packages/devextreme/js/__internal/integration/knockout/components.ts +++ b/packages/devextreme/js/__internal/integration/knockout/components.ts @@ -1,4 +1,4 @@ -import { getImageContainer } from '@ts/core/utils/m_icon'; +import { getImageContainer } from '@ts/core/utils/icon'; // eslint-disable-next-line import/no-extraneous-dependencies import ko from 'knockout'; diff --git a/packages/devextreme/js/__internal/integration/knockout/variable_wrapper_utils.ts b/packages/devextreme/js/__internal/integration/knockout/variable_wrapper_utils.ts index a5549dcd674c..ffaa0e28561e 100644 --- a/packages/devextreme/js/__internal/integration/knockout/variable_wrapper_utils.ts +++ b/packages/devextreme/js/__internal/integration/knockout/variable_wrapper_utils.ts @@ -1,4 +1,4 @@ -import { variableWrapper } from '@ts/core/utils/m_variable_wrapper'; +import { variableWrapper } from '@ts/core/utils/variable_wrapper'; // eslint-disable-next-line import/no-extraneous-dependencies import ko from 'knockout'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts index ca86ae5b6914..c47a45dc6f93 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts @@ -7,7 +7,7 @@ import { isDefined } from '@js/core/utils/type'; import type { Properties as DateBoxProperties } from '@js/ui/date_box'; import type { SimpleItem } from '@js/ui/form'; -import { getImageContainer } from '../../core/utils/m_icon'; +import { getImageContainer } from '../../core/utils/icon'; import { getRecurrenceString, parseRecurrenceRule } from '../recurrence/base'; import { daysFromByDayRule } from '../recurrence/days_from_by_day_rule'; import type { Rule } from '../recurrence/types'; diff --git a/packages/devextreme/js/__internal/scheduler/header/utils.ts b/packages/devextreme/js/__internal/scheduler/header/utils.ts index 749132ec8bf9..cca03df375ee 100644 --- a/packages/devextreme/js/__internal/scheduler/header/utils.ts +++ b/packages/devextreme/js/__internal/scheduler/header/utils.ts @@ -4,7 +4,7 @@ import { isFunction, isObject } from '@js/core/utils/type'; import messageLocalization from '@js/localization/message'; import type { DateNavigatorTextInfo, Properties } from '@js/ui/scheduler'; import type { BaseFormat } from '@ts/core/localization/date'; -import { camelize } from '@ts/core/utils/m_inflector'; +import { camelize } from '@ts/core/utils/inflector'; import type { IntervalOptions, Step } from '@ts/scheduler/header/types'; import type { NormalizedView, RawViewType, ViewType } from '@ts/scheduler/utils/options/types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/scheduler.ts b/packages/devextreme/js/__internal/scheduler/scheduler.ts index 588fd59a76f2..aeb75faa7ef8 100644 --- a/packages/devextreme/js/__internal/scheduler/scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/scheduler.ts @@ -59,7 +59,7 @@ import type { import errors from '@js/ui/widget/ui.errors'; import type { Options } from '@ts/core/options/index'; import { dateUtilsTs } from '@ts/core/utils/date'; -import { tabbable } from '@ts/core/utils/m_selectors'; +import { tabbable } from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import { focus } from '@ts/events/short'; import type Scrollable from '@ts/ui/scroll_view/scrollable'; diff --git a/packages/devextreme/js/__internal/sortable.ts b/packages/devextreme/js/__internal/sortable.ts index bd4985990486..fa49946a2039 100644 --- a/packages/devextreme/js/__internal/sortable.ts +++ b/packages/devextreme/js/__internal/sortable.ts @@ -12,7 +12,7 @@ import { } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; import fx from '@ts/common/core/animation/fx'; -import type { Quad } from '@ts/core/utils/m_string'; +import type { Quad } from '@ts/core/utils/string'; import type { OptionChanged } from '@ts/core/widget/types'; import Draggable from '@ts/draggable'; import type { EngineEvent } from '@ts/events/core/events_engine'; diff --git a/packages/devextreme/js/__internal/ui/button/button.tsx b/packages/devextreme/js/__internal/ui/button/button.tsx index fdc740883193..34426a0960ad 100644 --- a/packages/devextreme/js/__internal/ui/button/button.tsx +++ b/packages/devextreme/js/__internal/ui/button/button.tsx @@ -13,7 +13,7 @@ import type { EffectReturn } from '@ts/core/r1/utils/effect_return'; import { getTemplate } from '@ts/core/r1/utils/index'; import { Widget } from '@ts/core/r1/widget'; import { combineClasses } from '@ts/core/utils/combine_classes'; -import { getImageAriaLabel } from '@ts/core/utils/m_icon'; +import { getImageAriaLabel } from '@ts/core/utils/icon'; import { createRef as infernoCreateRef } from 'inferno'; import { Icon } from './icon'; diff --git a/packages/devextreme/js/__internal/ui/chat/file_view/file.ts b/packages/devextreme/js/__internal/ui/chat/file_view/file.ts index accc4980aac1..5211dcd43872 100644 --- a/packages/devextreme/js/__internal/ui/chat/file_view/file.ts +++ b/packages/devextreme/js/__internal/ui/chat/file_view/file.ts @@ -7,7 +7,7 @@ import type { Attachment, AttachmentDownloadClickEvent, } from '@js/ui/chat'; -import { getImageContainer } from '@ts/core/utils/m_icon'; +import { getImageContainer } from '@ts/core/utils/icon'; import type { DOMComponentProperties } from '@ts/core/widget/dom_component'; import DOMComponent from '@ts/core/widget/dom_component'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/ui/chat/messagebubble.ts b/packages/devextreme/js/__internal/ui/chat/messagebubble.ts index 56e9970183ea..057437de38cc 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagebubble.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagebubble.ts @@ -4,7 +4,7 @@ import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import type { Attachment, AttachmentDownloadClickEvent, Message } from '@js/ui/chat'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; -import { ICON_CLASS } from '@ts/core/utils/m_icon'; +import { ICON_CLASS } from '@ts/core/utils/icon'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; import FileView from '@ts/ui/chat/file_view/file_view'; diff --git a/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts index ce492a37e9d6..10edf2722830 100644 --- a/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts +++ b/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts @@ -36,7 +36,7 @@ import type { ItemLike, } from '@js/ui/collection/ui.collection_widget.base'; import { getPublicElement } from '@ts/core/element'; -import { focusable } from '@ts/core/utils/m_selectors'; +import { focusable } from '@ts/core/utils/selectors'; import type { ActionConfig } from '@ts/core/widget/component'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys, WidgetProperties } from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_box.ts b/packages/devextreme/js/__internal/ui/drop_down_box.ts index dd3ead93223a..e829fa3a06d4 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_box.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_box.ts @@ -15,7 +15,7 @@ import { isDefined, isObject } from '@js/core/utils/type'; import type { Properties } from '@js/ui/drop_down_box'; import DataExpressionMixin from '@js/ui/editor/ui.data_expression'; import { grep } from '@ts/core/utils/m_common'; -import { tabbable } from '@ts/core/utils/m_selectors'; +import { tabbable } from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import DropDownEditor, { type DropDownEditorInternalProperties } from '@ts/ui/drop_down_editor/drop_down_editor'; import type { PositioningEvent } from '@ts/ui/overlay/overlay'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts index 629ce3d29255..e29b3e7d6b00 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts @@ -35,7 +35,7 @@ import Popup from '@js/ui/popup/ui.popup'; import errors from '@js/ui/widget/ui.errors'; import Widget from '@js/ui/widget/ui.widget'; import { FunctionTemplate } from '@ts/core/templates/function_template'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import type { PositioningEvent } from '@ts/ui/overlay/overlay'; import type { PopoverProperties as InternalPopoverProperties } from '@ts/ui/popover/popover'; diff --git a/packages/devextreme/js/__internal/ui/errors.ts b/packages/devextreme/js/__internal/ui/errors.ts index 71c74640c26b..5b4ed085a6c6 100644 --- a/packages/devextreme/js/__internal/ui/errors.ts +++ b/packages/devextreme/js/__internal/ui/errors.ts @@ -1,5 +1,5 @@ import errors from '@ts/core/errors'; -import errorUtils from '@ts/core/utils/m_error'; +import errorUtils from '@ts/core/utils/error'; export default errorUtils(errors.ERROR_MESSAGES, { E1001: 'Module \'{0}\'. Controller \'{1}\' is already registered', diff --git a/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts b/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts index b3d6f9b6a414..da98ed4fba2d 100644 --- a/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts +++ b/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts @@ -18,7 +18,7 @@ import type { Properties as ButtonProperties } from '@js/ui/button'; import Button from '@js/ui/button'; import ProgressBar from '@js/ui/progress_bar'; import { current, isFluent, isMaterial } from '@js/ui/themes'; -import { ICON_CLASS } from '@ts/core/utils/m_icon'; +import { ICON_CLASS } from '@ts/core/utils/icon'; import type { OptionChanged } from '@ts/core/widget/types'; import Editor from '@ts/ui/editor/editor'; import { CustomChunksFileUploadStrategy } from '@ts/ui/file_uploader/file_upload_strategy.chunks.custom'; diff --git a/packages/devextreme/js/__internal/ui/informer/informer.ts b/packages/devextreme/js/__internal/ui/informer/informer.ts index 46c233664fc2..b59dda733dc4 100644 --- a/packages/devextreme/js/__internal/ui/informer/informer.ts +++ b/packages/devextreme/js/__internal/ui/informer/informer.ts @@ -2,7 +2,7 @@ import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; -import { getImageContainer } from '@ts/core/utils/m_icon'; +import { getImageContainer } from '@ts/core/utils/icon'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/overlay/overlay.ts b/packages/devextreme/js/__internal/ui/overlay/overlay.ts index 05dffed8e9b8..d9f58e12bf27 100644 --- a/packages/devextreme/js/__internal/ui/overlay/overlay.ts +++ b/packages/devextreme/js/__internal/ui/overlay/overlay.ts @@ -41,8 +41,8 @@ import type { dxOverlayAnimation, Properties } from '@js/ui/overlay'; import uiErrors from '@js/ui/widget/ui.errors'; import documentSizeCallbacks from '@ts/core/utils/document_size_callbacks'; import domUtils from '@ts/core/utils/m_dom'; -import selectors from '@ts/core/utils/m_selectors'; import windowUtils from '@ts/core/utils/m_window'; +import selectors from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys } from '@ts/core/widget/widget'; import Widget from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/stepper/stepper.ts b/packages/devextreme/js/__internal/ui/stepper/stepper.ts index c93aaf84749a..eca3d1594fa7 100644 --- a/packages/devextreme/js/__internal/ui/stepper/stepper.ts +++ b/packages/devextreme/js/__internal/ui/stepper/stepper.ts @@ -8,7 +8,7 @@ import type { DxEvent } from '@js/events'; import type { Item, Properties } from '@js/ui/stepper'; import { BindableTemplate } from '@ts/core/templates/bindable_template'; import type { Template } from '@ts/core/templates/template'; -import { getImageContainer } from '@ts/core/utils/m_icon'; +import { getImageContainer } from '@ts/core/utils/icon'; import type { ActionConfig } from '@ts/core/widget/component'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys } from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts b/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts index 827c7cdbe7ad..47297e4b9871 100644 --- a/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts +++ b/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts @@ -16,7 +16,7 @@ import { isDefined, isPlainObject } from '@js/core/utils/type'; import type { DxEvent } from '@js/events'; import type { Item, Properties } from '@js/ui/tab_panel'; import { current as currentTheme, isFluent, isMaterialBased } from '@js/ui/themes'; -import { getImageAriaLabel, getImageContainer } from '@ts/core/utils/m_icon'; +import { getImageAriaLabel, getImageContainer } from '@ts/core/utils/icon'; import supportUtils from '@ts/core/utils/m_support'; import type { OptionChanged } from '@ts/core/widget/types'; import type { MultiViewProperties } from '@ts/ui/multi_view/multi_view'; diff --git a/packages/devextreme/js/__internal/ui/tabs/tabs.ts b/packages/devextreme/js/__internal/ui/tabs/tabs.ts index 12bff4c2eb19..371a7a2e15b1 100644 --- a/packages/devextreme/js/__internal/ui/tabs/tabs.ts +++ b/packages/devextreme/js/__internal/ui/tabs/tabs.ts @@ -25,8 +25,8 @@ import type { TabsStyle, } from '@js/ui/tabs'; import { current as currentTheme, isFluent, isMaterial } from '@js/ui/themes'; +import { getImageAriaLabel, getImageContainer } from '@ts/core/utils/icon'; import { render } from '@ts/core/utils/ink_ripple'; -import { getImageAriaLabel, getImageContainer } from '@ts/core/utils/m_icon'; import type { OptionChanged } from '@ts/core/widget/types'; import type { CollectionItemInfo, diff --git a/packages/devextreme/js/__internal/ui/text_box/text_editor.base.ts b/packages/devextreme/js/__internal/ui/text_box/text_editor.base.ts index f073e8992fa7..1f568c12d63a 100644 --- a/packages/devextreme/js/__internal/ui/text_box/text_editor.base.ts +++ b/packages/devextreme/js/__internal/ui/text_box/text_editor.base.ts @@ -24,7 +24,7 @@ import type dxTextBox from '@js/ui/text_box'; import type { dxTextEditorOptions } from '@js/ui/text_box/ui.text_editor.base'; import { current, isFluent, isMaterial } from '@js/ui/themes'; import errors from '@js/ui/widget/ui.errors'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import type { EditorInternalProperties, ValueChangedEvent, WithValidationMessageMode } from '@ts/ui/editor/editor'; import Editor from '@ts/ui/editor/editor'; diff --git a/packages/devextreme/js/__internal/ui/text_box/text_editor.mask.ts b/packages/devextreme/js/__internal/ui/text_box/text_editor.mask.ts index 4a18e79436ff..8d0fc66214c9 100644 --- a/packages/devextreme/js/__internal/ui/text_box/text_editor.mask.ts +++ b/packages/devextreme/js/__internal/ui/text_box/text_editor.mask.ts @@ -11,7 +11,7 @@ import { extend } from '@js/core/utils/extend'; import { isEmpty } from '@js/core/utils/string'; import { isDefined } from '@js/core/utils/type'; import type { DxEvent } from '@js/events'; -import { focused } from '@ts/core/utils/m_selectors'; +import { focused } from '@ts/core/utils/selectors'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys } from '@ts/core/widget/widget'; import type { ValueChangedEvent } from '@ts/ui/editor/editor'; diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts index 8bcfbb4c8168..dbab86cb2988 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts @@ -16,8 +16,8 @@ import { version } from '@js/core/version'; import { resizeObserverSingleton } from '@ts/core/resize_observer'; import { each } from '@ts/core/utils/m_iterator'; -import { resizeCallbacks as _windowResizeCallbacks } from '@ts/core/utils/m_resize_callbacks'; -import { format as _stringFormat } from '@ts/core/utils/m_string'; +import { resizeCallbacks as _windowResizeCallbacks } from '@ts/core/utils/resize_callbacks'; +import { format as _stringFormat } from '@ts/core/utils/string'; import warnings from '@ts/viz/core/errors_warnings'; import { normalizeEnum } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/core/errors_warnings.ts b/packages/devextreme/js/__internal/viz/core/errors_warnings.ts index 04b5c64d923a..c81e9009f601 100644 --- a/packages/devextreme/js/__internal/viz/core/errors_warnings.ts +++ b/packages/devextreme/js/__internal/viz/core/errors_warnings.ts @@ -1,5 +1,5 @@ import errors from '@ts/core/errors'; -import { error as errorUtils } from '@ts/core/utils/m_error'; +import { error as errorUtils } from '@ts/core/utils/error'; export default errorUtils(errors.ERROR_MESSAGES, { E2001: 'Invalid data source', diff --git a/packages/devextreme/js/__internal/viz/core/export.ts b/packages/devextreme/js/__internal/viz/core/export.ts index 3d7b53464d69..776db63773d0 100644 --- a/packages/devextreme/js/__internal/viz/core/export.ts +++ b/packages/devextreme/js/__internal/viz/core/export.ts @@ -23,9 +23,9 @@ import { renderer as $ } from '@ts/core/renderer'; import { logger } from '@ts/core/utils/m_console'; import { extend } from '@ts/core/utils/m_extend'; import { getWidth } from '@ts/core/utils/m_size'; -import { HIDDEN_FOR_EXPORT } from '@ts/core/utils/m_svg'; import { isDefined } from '@ts/core/utils/m_type'; import { getWindow } from '@ts/core/utils/m_window'; +import { HIDDEN_FOR_EXPORT } from '@ts/core/utils/svg'; import { end as hoverEventEnd, start as hoverEventStart } from '@ts/events/hover'; import pointerEvents from '@ts/events/pointer'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts index 7d27303f9807..b5f9b7cdc5cc 100644 --- a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts +++ b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts @@ -39,9 +39,9 @@ import { domAdapter } from '@ts/core/dom_adapter'; import { renderer as $ } from '@ts/core/renderer'; import type { Renderer as CoreRenderer } from '@ts/core/renderer_base'; import { callOnce } from '@ts/core/utils/call_once'; -import { getSvgMarkup } from '@ts/core/utils/m_svg'; import { isDefined } from '@ts/core/utils/m_type'; import { getWindow } from '@ts/core/utils/m_window'; +import { getSvgMarkup } from '@ts/core/utils/svg'; import eventsEngine from '@ts/events/core/events_engine'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Animation, AnimationOptions } from '@ts/viz/core/renderers/animation'; diff --git a/packages/devextreme/js/__internal/viz/core/tooltip.ts b/packages/devextreme/js/__internal/viz/core/tooltip.ts index cb8a468e88cb..c90b3a10c6b7 100644 --- a/packages/devextreme/js/__internal/viz/core/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/core/tooltip.ts @@ -20,13 +20,13 @@ import { domAdapter } from '@ts/core/dom_adapter'; import formatHelper from '@ts/core/format_helper'; import { renderer as $ } from '@ts/core/renderer'; import type { Renderer as CoreRenderer } from '@ts/core/renderer_base'; +import { camelize } from '@ts/core/utils/inflector'; import { replaceWith } from '@ts/core/utils/m_dom'; import { extend } from '@ts/core/utils/m_extend'; -import { camelize } from '@ts/core/utils/m_inflector'; import { getHeight, getWidth } from '@ts/core/utils/m_size'; -import { normalizeStyleProp } from '@ts/core/utils/m_style'; import { isDefined, isFunction, isPlainObject } from '@ts/core/utils/m_type'; import { getWindow } from '@ts/core/utils/m_window'; +import { normalizeStyleProp } from '@ts/core/utils/style'; import type { ThemeValue } from './base_theme_manager'; import { Plaque } from './plaque'; diff --git a/packages/devextreme/js/__internal/viz/gauges/tracker.ts b/packages/devextreme/js/__internal/viz/gauges/tracker.ts index 3f9d5765ee9e..a8a7ee9921f2 100644 --- a/packages/devextreme/js/__internal/viz/gauges/tracker.ts +++ b/packages/devextreme/js/__internal/viz/gauges/tracker.ts @@ -2,7 +2,7 @@ import { domAdapter } from '@ts/core/dom_adapter'; /// #DEBUG import { debug } from '@ts/core/utils/m_console'; /// #ENDDEBUG -import { readyCallbacksModule as ReadyCallbacks } from '@ts/core/utils/m_ready_callbacks'; +import { readyCallbacksModule as ReadyCallbacks } from '@ts/core/utils/ready_callbacks'; import eventsEngine from '@ts/events/core/events_engine'; import { name as wheelEventName } from '@ts/events/core/wheel'; import pointerEvents from '@ts/events/pointer'; diff --git a/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts b/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts index 936f237ef932..3c86a3cc433f 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts @@ -1,7 +1,7 @@ /* eslint-disable no-return-assign */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { Callbacks } from '@ts/core/utils/m_callbacks'; +import { Callbacks } from '@ts/core/utils/callbacks'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; type DataCallback = (data: ThemeValue) => void; diff --git a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts index 1a5c96646ef8..23b2b1cd5847 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { Callbacks } from '@ts/core/utils/m_callbacks'; +import { Callbacks } from '@ts/core/utils/callbacks'; const eventEmitterMethods = { _initEvents() { diff --git a/packages/devextreme/js/core/utils/callbacks.js b/packages/devextreme/js/core/utils/callbacks.js index fa360161d4e6..be07876c850d 100644 --- a/packages/devextreme/js/core/utils/callbacks.js +++ b/packages/devextreme/js/core/utils/callbacks.js @@ -1,3 +1,3 @@ // deprecated -import { Callbacks } from '../../__internal/core/utils/m_callbacks'; +import { Callbacks } from '../../__internal/core/utils/callbacks'; export default Callbacks; diff --git a/packages/devextreme/js/core/utils/comparator.js b/packages/devextreme/js/core/utils/comparator.js index c0184590ee62..f0f15c2f8bc2 100644 --- a/packages/devextreme/js/core/utils/comparator.js +++ b/packages/devextreme/js/core/utils/comparator.js @@ -1,2 +1,2 @@ // deprecated -export { equals } from '../../__internal/core/utils/m_comparator'; +export { equals } from '../../__internal/core/utils/comparator'; diff --git a/packages/devextreme/js/core/utils/error.js b/packages/devextreme/js/core/utils/error.js index 4a3499f9c824..d2be562736d5 100644 --- a/packages/devextreme/js/core/utils/error.js +++ b/packages/devextreme/js/core/utils/error.js @@ -1,3 +1,3 @@ // deprecated -import { error } from '../../__internal/core/utils/m_error'; +import { error } from '../../__internal/core/utils/error'; export default error; diff --git a/packages/devextreme/js/core/utils/html_parser.js b/packages/devextreme/js/core/utils/html_parser.js index 03428a1915ec..b97f378a4a2a 100644 --- a/packages/devextreme/js/core/utils/html_parser.js +++ b/packages/devextreme/js/core/utils/html_parser.js @@ -1,2 +1,2 @@ // deprecated -export { parseHTML, isTablePart } from '../../__internal/core/utils/m_html_parser'; +export { parseHTML, isTablePart } from '../../__internal/core/utils/html_parser'; diff --git a/packages/devextreme/js/core/utils/icon.js b/packages/devextreme/js/core/utils/icon.js index 4c00475a8207..2696dbe7a29c 100644 --- a/packages/devextreme/js/core/utils/icon.js +++ b/packages/devextreme/js/core/utils/icon.js @@ -1,2 +1,2 @@ // deprecated -export { getImageContainer, getImageSourceType } from '../../__internal/core/utils/m_icon'; +export { getImageContainer, getImageSourceType } from '../../__internal/core/utils/icon'; diff --git a/packages/devextreme/js/core/utils/inflector.js b/packages/devextreme/js/core/utils/inflector.js index 73c2812948fc..e745102e719d 100644 --- a/packages/devextreme/js/core/utils/inflector.js +++ b/packages/devextreme/js/core/utils/inflector.js @@ -6,4 +6,4 @@ export { humanize, titleize, captionize, -} from '../../__internal/core/utils/m_inflector'; +} from '../../__internal/core/utils/inflector'; diff --git a/packages/devextreme/js/core/utils/position.js b/packages/devextreme/js/core/utils/position.js index 3de09547171d..05f3ff73e02a 100644 --- a/packages/devextreme/js/core/utils/position.js +++ b/packages/devextreme/js/core/utils/position.js @@ -2,4 +2,4 @@ export { getBoundingRect, getDefaultAlignment, -} from '../../__internal/core/utils/m_position'; +} from '../../__internal/core/utils/position'; diff --git a/packages/devextreme/js/core/utils/public_component.js b/packages/devextreme/js/core/utils/public_component.js index f06874e94fc1..2752dd5d57a4 100644 --- a/packages/devextreme/js/core/utils/public_component.js +++ b/packages/devextreme/js/core/utils/public_component.js @@ -3,4 +3,4 @@ export { attachInstanceToElement, getInstanceByElement, name, -} from '../../__internal/core/utils/m_public_component'; +} from '../../__internal/core/utils/public_component'; diff --git a/packages/devextreme/js/core/utils/queue.js b/packages/devextreme/js/core/utils/queue.js index dc70d7550b09..abdcf2799369 100644 --- a/packages/devextreme/js/core/utils/queue.js +++ b/packages/devextreme/js/core/utils/queue.js @@ -1,2 +1,2 @@ // deprecated -export { create, enqueue } from '../../__internal/core/utils/m_queue'; +export { create, enqueue } from '../../__internal/core/utils/queue'; diff --git a/packages/devextreme/js/core/utils/ready_callbacks.js b/packages/devextreme/js/core/utils/ready_callbacks.js index bf4411c0caa3..e62644c8a8b9 100644 --- a/packages/devextreme/js/core/utils/ready_callbacks.js +++ b/packages/devextreme/js/core/utils/ready_callbacks.js @@ -1,3 +1,3 @@ // deprecated -import { readyCallbacksModule } from '../../__internal/core/utils/m_ready_callbacks'; +import { readyCallbacksModule } from '../../__internal/core/utils/ready_callbacks'; export default readyCallbacksModule; diff --git a/packages/devextreme/js/core/utils/resize_callbacks.js b/packages/devextreme/js/core/utils/resize_callbacks.js index b8a3651d5de2..33ccdb5fb618 100644 --- a/packages/devextreme/js/core/utils/resize_callbacks.js +++ b/packages/devextreme/js/core/utils/resize_callbacks.js @@ -1,3 +1,3 @@ // deprecated -import { resizeCallbacks } from '../../__internal/core/utils/m_resize_callbacks'; +import { resizeCallbacks } from '../../__internal/core/utils/resize_callbacks'; export default resizeCallbacks; diff --git a/packages/devextreme/js/core/utils/selection_filter.js b/packages/devextreme/js/core/utils/selection_filter.js index 27d818ff0365..1c207f92415d 100644 --- a/packages/devextreme/js/core/utils/selection_filter.js +++ b/packages/devextreme/js/core/utils/selection_filter.js @@ -1,2 +1,2 @@ // deprecated -export { SelectionFilterCreator } from '../../__internal/core/utils/m_selection_filter'; +export { SelectionFilterCreator } from '../../__internal/core/utils/selection_filter'; diff --git a/packages/devextreme/js/core/utils/shadow_dom.js b/packages/devextreme/js/core/utils/shadow_dom.js index 9db1e65910d0..2f3a4e94f492 100644 --- a/packages/devextreme/js/core/utils/shadow_dom.js +++ b/packages/devextreme/js/core/utils/shadow_dom.js @@ -1,2 +1,2 @@ // deprecated -export { addShadowDomStyles, getShadowElementsFromPoint } from '../../__internal/core/utils/m_shadow_dom'; +export { addShadowDomStyles, getShadowElementsFromPoint } from '../../__internal/core/utils/shadow_dom'; diff --git a/packages/devextreme/js/core/utils/storage.js b/packages/devextreme/js/core/utils/storage.js index 32e3f750c621..0864fe522199 100644 --- a/packages/devextreme/js/core/utils/storage.js +++ b/packages/devextreme/js/core/utils/storage.js @@ -1,2 +1,2 @@ // deprecated -export { sessionStorage } from '../../__internal/core/utils/m_storage'; +export { sessionStorage } from '../../__internal/core/utils/storage'; diff --git a/packages/devextreme/js/core/utils/string.js b/packages/devextreme/js/core/utils/string.js index 02a19e7e745c..16a7cfc4eb5d 100644 --- a/packages/devextreme/js/core/utils/string.js +++ b/packages/devextreme/js/core/utils/string.js @@ -4,4 +4,4 @@ export { quadToObject, format, isEmpty -} from '../../__internal/core/utils/m_string'; +} from '../../__internal/core/utils/string'; diff --git a/packages/devextreme/js/core/utils/style.js b/packages/devextreme/js/core/utils/style.js index e78c4d82437f..f2585e4f49be 100644 --- a/packages/devextreme/js/core/utils/style.js +++ b/packages/devextreme/js/core/utils/style.js @@ -7,4 +7,4 @@ export { setWidth, styleProp, stylePropPrefix, -} from '../../__internal/core/utils/m_style'; +} from '../../__internal/core/utils/style'; diff --git a/packages/devextreme/js/core/utils/svg.js b/packages/devextreme/js/core/utils/svg.js index fec9ec9bccfb..a56eb3f52875 100644 --- a/packages/devextreme/js/core/utils/svg.js +++ b/packages/devextreme/js/core/utils/svg.js @@ -3,4 +3,4 @@ export { HIDDEN_FOR_EXPORT, getSvgMarkup, getSvgElement, -} from '../../__internal/core/utils/m_svg'; +} from '../../__internal/core/utils/svg'; diff --git a/packages/devextreme/js/core/utils/variable_wrapper.js b/packages/devextreme/js/core/utils/variable_wrapper.js index 6760bc3dd1af..7e036810119e 100644 --- a/packages/devextreme/js/core/utils/variable_wrapper.js +++ b/packages/devextreme/js/core/utils/variable_wrapper.js @@ -1,3 +1,3 @@ // deprecated -import { variableWrapper } from '../../__internal/core/utils/m_variable_wrapper'; +import { variableWrapper } from '../../__internal/core/utils/variable_wrapper'; export default variableWrapper; diff --git a/packages/devextreme/js/core/utils/view_port.js b/packages/devextreme/js/core/utils/view_port.js index 6fb1959d8e3b..05819cd8d07a 100644 --- a/packages/devextreme/js/core/utils/view_port.js +++ b/packages/devextreme/js/core/utils/view_port.js @@ -3,4 +3,4 @@ export { changeCallback, originalViewPort, value -} from '../../__internal/core/utils/m_view_port'; +} from '../../__internal/core/utils/view_port'; diff --git a/packages/devextreme/testing/helpers/keyboardMock.js b/packages/devextreme/testing/helpers/keyboardMock.js index 1107d8978d43..ee84bb1e3d45 100644 --- a/packages/devextreme/testing/helpers/keyboardMock.js +++ b/packages/devextreme/testing/helpers/keyboardMock.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import * as inferno from 'inferno'; -import { focused } from '__internal/core/utils/m_selectors'; +import { focused } from '__internal/core/utils/selectors'; const keyboardMock = (function($, inferno) { let $element; diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.error.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.error.tests.js index 1d41319c17f9..6602cbc01814 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.error.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.error.tests.js @@ -1,4 +1,4 @@ -import errorUtils from '__internal/core/utils/m_error'; +import errorUtils from '__internal/core/utils/error'; import consoleUtils from '__internal/core/utils/m_console'; const errors = errorUtils({ diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.icon.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.icon.tests.js index c61c0e8a06b9..f397474798d8 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.icon.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.icon.tests.js @@ -1,5 +1,5 @@ import { getImageSourceType, getImageContainer } from 'core/utils/icon'; -import { getImageAriaLabel } from '__internal/core/utils/m_icon'; +import { getImageAriaLabel } from '__internal/core/utils/icon'; import localization from 'localization'; import ja from 'localization/messages/ja.json!'; diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.resize_callbacks.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.resize_callbacks.tests.js index 60c609e1d050..5eb34d2a3862 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.resize_callbacks.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.resize_callbacks.tests.js @@ -1,4 +1,4 @@ -import resizeCallbacks from '__internal/core/utils/m_resize_callbacks'; +import resizeCallbacks from '__internal/core/utils/resize_callbacks'; import domAdapter from '__internal/core/dom_adapter'; import windowUtils from '__internal/core/utils/m_window'; diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.shadow_dom.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.shadow_dom.tests.js index 41e5cf96edbd..33edbf257eca 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.shadow_dom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.shadow_dom.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { computeStyleSheetsHash, addShadowDomStyles } from '__internal/core/utils/m_shadow_dom'; +import { computeStyleSheetsHash, addShadowDomStyles } from '__internal/core/utils/shadow_dom'; QUnit.module('computeStyleSheetsHash', () => { QUnit.test('Returns consistent hash for same content', function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.exporter/imageCreator.tests.js b/packages/devextreme/testing/tests/DevExpress.exporter/imageCreator.tests.js index a1af698c0299..ada28b706197 100644 --- a/packages/devextreme/testing/tests/DevExpress.exporter/imageCreator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.exporter/imageCreator.tests.js @@ -4,7 +4,7 @@ const imageCreator = exporter.image.creator; import typeUtils from 'core/utils/type'; const testingMarkupStart = ''; const testingMarkupEnd = ''; -import svgUtils from '__internal/core/utils/m_svg'; +import svgUtils from '__internal/core/utils/svg'; import { Deferred } from 'core/utils/deferred'; import { getWindow } from 'core/utils/window'; diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/selectors.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/selectors.tests.js index 3e03a4f8c55f..0d98524ba30d 100644 --- a/packages/devextreme/testing/tests/DevExpress.jquery/selectors.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.jquery/selectors.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import selectors from '__internal/core/utils/m_selectors'; +import selectors from '__internal/core/utils/selectors'; if(!QUnit.urlParams['nojquery']) { QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js index e62f61a65610..455608cce16a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js @@ -2,7 +2,7 @@ import { getWidth, getHeight } from 'core/utils/size'; import device from 'core/devices'; import config from 'core/config'; import domAdapter from '__internal/core/dom_adapter'; -import resizeCallbacks from '__internal/core/utils/m_resize_callbacks'; +import resizeCallbacks from '__internal/core/utils/resize_callbacks'; import typeUtils from 'core/utils/type'; import { extend } from 'core/utils/extend'; import messageLocalization from 'localization/message'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js index 3820cded94d2..98f19374f61f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import ArrayStore from 'common/data/array_store'; import { CustomStore } from 'common/data/custom_store'; -import inflector from '__internal/core/utils/m_inflector'; +import inflector from '__internal/core/utils/inflector'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import summaryDisplayModesModule from '__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes'; import xmlaStoreModule, { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js index 0df2590f3ba9..958ef47a7f4c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js @@ -20,7 +20,7 @@ import uiErrors from 'ui/widget/ui.errors'; import Overlay from 'ui/overlay/ui.overlay'; import * as zIndex from '__internal/ui/overlay/z_index'; import 'ui/scroll_view/ui.scrollable'; -import selectors from '__internal/core/utils/m_selectors'; +import selectors from '__internal/core/utils/selectors'; import swatch from '__internal/core/utils/swatch_container'; import documentSizeCallbacks from '__internal/core/utils/document_size_callbacks'; import keyboardMock from '../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js index e11227e0f5ea..e3efb6a15249 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js @@ -6,7 +6,7 @@ import browser from 'core/utils/browser'; import devices from '__internal/core/devices'; import themes from 'ui/themes'; import support from '__internal/core/utils/m_support'; -import publicComponentUtils from '__internal/core/utils/m_public_component'; +import publicComponentUtils from '__internal/core/utils/public_component'; import { isFunction } from 'core/utils/type'; import { getNestedOptionValue } from 'core/options/utils';