diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2adf73bb9270..34458f09c6b3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -615,7 +615,7 @@ ## viz /packages/devextreme/js/viz/** @DevExpress/devextreme-components -/packages/devextreme/js/__internal/common/m_charts.ts @DevExpress/devextreme-components +/packages/devextreme/js/__internal/common/charts.ts @DevExpress/devextreme-components /packages/devextreme/js/__internal/viz/** @DevExpress/devextreme-components /apps/demos/Demos/Charts/** @DevExpress/devextreme-components diff --git a/packages/devextreme/js/__internal/common/m_charts.ts b/packages/devextreme/js/__internal/common/charts.ts similarity index 76% rename from packages/devextreme/js/__internal/common/m_charts.ts rename to packages/devextreme/js/__internal/common/charts.ts index a58b182e3fd5..b4c8d6c4e458 100644 --- a/packages/devextreme/js/__internal/common/m_charts.ts +++ b/packages/devextreme/js/__internal/common/charts.ts @@ -1,3 +1,6 @@ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + import { getNextDefsSvgId } from '@ts/viz/core/utils'; const graphicObjects = {}; diff --git a/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts b/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts index a64e9ae4c5b0..6480fe035ad1 100644 --- a/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts +++ b/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts @@ -12,7 +12,7 @@ import { isPlainObject } from '@ts/core/utils/m_type'; import Draggable from '@ts/m_draggable'; import Editor from '@ts/ui/editor/editor'; import ScrollView from '@ts/ui/scroll_view/scroll_view'; -import VizWidget from '@ts/viz/core/m_base_widget'; +import VizWidget from '@ts/viz/core/base_widget'; // eslint-disable-next-line import/no-extraneous-dependencies import ko from 'knockout'; diff --git a/packages/devextreme/js/__internal/viz/m_chart.ts b/packages/devextreme/js/__internal/viz/chart.ts similarity index 98% rename from packages/devextreme/js/__internal/viz/m_chart.ts rename to packages/devextreme/js/__internal/viz/chart.ts index bc3c457e70ea..e0f3365ad91c 100644 --- a/packages/devextreme/js/__internal/viz/m_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart.ts @@ -1,3 +1,22 @@ +/* eslint-disable @stylistic/max-len */ +/* eslint-disable @stylistic/no-mixed-operators */ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/init-declarations */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-shadow */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ +/* eslint-disable @typescript-eslint/no-unused-expressions */ +/* eslint-disable @typescript-eslint/no-use-before-define */ +/* eslint-disable @typescript-eslint/prefer-for-of */ +/* eslint-disable @typescript-eslint/prefer-for-of */ +/* eslint-disable consistent-return */ +/* eslint-disable max-depth */ +/* eslint-disable no-bitwise */ +/* eslint-disable no-continue */ +/* eslint-disable no-multi-assign */ +/* eslint-disable no-param-reassign */ +/* eslint-disable no-plusplus */ + import registerComponent from '@js/core/component_registrator'; import { noop } from '@js/core/utils/common'; import { extend as _extend } from '@js/core/utils/extend'; @@ -26,8 +45,8 @@ import rangeDataCalculator from '@ts/viz/series/helpers/range_data_calculator'; import { Range } from '@ts/viz/translators/range'; import { prepareSegmentRectPoints } from '@ts/viz/utils'; -import { AdvancedChart } from './chart_components/m_advanced_chart'; -import { overlapping } from './chart_components/m_base_chart'; +import { AdvancedChart } from './chart_components/advanced_chart'; +import { overlapping } from './chart_components/base_chart'; const DEFAULT_PANE_NAME = 'default'; const VISUAL_RANGE = 'VISUAL_RANGE'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/m_advanced_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts similarity index 97% rename from packages/devextreme/js/__internal/viz/chart_components/m_advanced_chart.ts rename to packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts index 22b377c81817..45f4a0c4be68 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/m_advanced_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts @@ -1,3 +1,19 @@ +/* eslint-disable @stylistic/max-len */ +/* eslint-disable @stylistic/no-mixed-operators */ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/init-declarations */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-shadow */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ +/* eslint-disable @typescript-eslint/no-use-before-define */ +/* eslint-disable @typescript-eslint/prefer-for-of */ +/* eslint-disable max-depth */ +/* eslint-disable no-multi-assign */ +/* eslint-disable no-nested-ternary */ +/* eslint-disable no-param-reassign */ +/* eslint-disable prefer-rest-params */ +/* eslint-disable prefer-spread */ + import { noop as _noop } from '@js/core/utils/common'; import { extend as _extend } from '@js/core/utils/extend'; import { reverseEach as _reverseEach } from '@js/core/utils/iterator'; @@ -13,7 +29,7 @@ import { import rangeDataCalculator from '@ts/viz/series/helpers/range_data_calculator'; import { Range } from '@ts/viz/translators/range'; -import { BaseChart } from './m_base_chart'; +import { BaseChart } from './base_chart'; const { isArray } = Array; diff --git a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts similarity index 97% rename from packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts rename to packages/devextreme/js/__internal/viz/chart_components/base_chart.ts index 5e4a82bff170..6009f4a7ba6f 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts @@ -1,3 +1,24 @@ +/* eslint-disable @stylistic/max-len */ +/* eslint-disable @stylistic/no-mixed-operators */ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/init-declarations */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-shadow */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ +/* eslint-disable @typescript-eslint/no-unused-expressions */ +/* eslint-disable @typescript-eslint/no-use-before-define */ +/* eslint-disable consistent-return */ +/* eslint-disable max-depth */ +/* eslint-disable no-bitwise */ +/* eslint-disable no-continue */ +/* eslint-disable no-multi-assign */ +/* eslint-disable no-nested-ternary */ +/* eslint-disable no-param-reassign */ +/* eslint-disable no-plusplus */ +/* eslint-disable prefer-rest-params */ +/* eslint-disable prefer-spread */ + import eventsEngine from '@js/common/core/events/core/events_engine'; import { isPointerEvent, isTouchEvent } from '@js/common/core/events/utils/index'; // @ts-expect-error @@ -19,7 +40,7 @@ import { plugin as tooltipPlugin } from '@ts/viz/core/tooltip'; import { map as _map, processSeriesTemplate, setCanvasValues as _setCanvasValues } from '@ts/viz/core/utils'; import { Series } from '@ts/viz/series/base_series'; -import BaseWidget from '../core/m_base_widget'; +import BaseWidget from '../core/base_widget'; import { RollingStock } from './rolling_stock'; type SortingMethodParams = (a: any, b: any) => number; diff --git a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts b/packages/devextreme/js/__internal/viz/core/base_widget.ts similarity index 97% rename from packages/devextreme/js/__internal/viz/core/m_base_widget.ts rename to packages/devextreme/js/__internal/viz/core/base_widget.ts index a82441b63ea3..d699053f2589 100644 --- a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.ts @@ -1,3 +1,16 @@ +/* eslint-disable @stylistic/no-mixed-operators */ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-shadow */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ +/* eslint-disable @typescript-eslint/no-unused-expressions */ +/* eslint-disable consistent-return */ +/* eslint-disable max-depth */ +/* eslint-disable no-nested-ternary */ +/* eslint-disable no-plusplus */ +/* eslint-disable prefer-rest-params */ +/* eslint-disable prefer-spread */ + import eventsEngine from '@js/common/core/events/core/events_engine'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -15,7 +28,7 @@ import { getWindow, hasWindow } from '@js/core/utils/window'; import warnings from '@js/viz/core/errors_warnings'; // @ts-expect-error import { areCanvasesDifferent, floorCanvasDimensions } from '@js/viz/utils'; -import graphicObject from '@ts/common/m_charts'; +import graphicObject from '@ts/common/charts'; import { BaseThemeManager } from '@ts/viz/core/base_theme_manager'; import { createEventTrigger, diff --git a/packages/devextreme/js/__internal/viz/funnel/funnel.ts b/packages/devextreme/js/__internal/viz/funnel/funnel.ts index e5277f9eacc3..ffd560688f59 100644 --- a/packages/devextreme/js/__internal/viz/funnel/funnel.ts +++ b/packages/devextreme/js/__internal/viz/funnel/funnel.ts @@ -12,8 +12,8 @@ // PLUGINS_SECTION import componentRegistrator from '@js/core/component_registrator'; import { noop } from '@js/core/utils/common'; +import baseWidget from '@ts/viz/core/base_widget'; import { plugin } from '@ts/viz/core/data_source'; -import baseWidget from '@ts/viz/core/m_base_widget'; import Item from './item'; import { addAlgorithm, getAlgorithm } from './tiling'; diff --git a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts index 97b5d9345cd2..b0db47753823 100644 --- a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts @@ -25,7 +25,7 @@ import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { roundFloatPart } from '@js/core/utils/math'; import { clone } from '@js/core/utils/object'; -import { overlapping } from '@ts/viz/chart_components/m_base_chart'; +import { overlapping } from '@ts/viz/chart_components/base_chart'; import { plugin as pluginLegend } from '@ts/viz/components/legend'; import { plugins as centerTemplatePlugins } from '@ts/viz/core/center_template'; import { diff --git a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts index ee1b06dec28e..2b06175e6421 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts @@ -21,9 +21,9 @@ import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import formatHelper from '@js/format_helper'; +import BaseWidget from '@ts/viz/core/base_widget'; import { plugin as exportPlugin } from '@ts/viz/core/export'; import { plugin as loadingIndicatorPlugin } from '@ts/viz/core/loading_indicator'; -import BaseWidget from '@ts/viz/core/m_base_widget'; import { plugin as titlePlugin } from '@ts/viz/core/title'; import { plugin as tooltipPlugin } from '@ts/viz/core/tooltip'; import { getAppropriateFormat as _getAppropriateFormat } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/m_pie_chart.ts b/packages/devextreme/js/__internal/viz/pie_chart.ts similarity index 95% rename from packages/devextreme/js/__internal/viz/m_pie_chart.ts rename to packages/devextreme/js/__internal/viz/pie_chart.ts index 547ab4c93de4..2cda61377d2b 100644 --- a/packages/devextreme/js/__internal/viz/m_pie_chart.ts +++ b/packages/devextreme/js/__internal/viz/pie_chart.ts @@ -1,3 +1,16 @@ +/* eslint-disable @stylistic/max-len */ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ +/* eslint-disable @typescript-eslint/init-declarations */ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-shadow */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ +/* eslint-disable no-bitwise */ +/* eslint-disable no-param-reassign */ +/* eslint-disable no-plusplus */ +/* eslint-disable prefer-rest-params */ +/* eslint-disable prefer-spread */ +/* eslint-disable */ + import registerComponent from '@js/core/component_registrator'; import { noop as _noop } from '@js/core/utils/common'; import { extend as _extend } from '@js/core/utils/extend'; @@ -10,7 +23,7 @@ import { getVerticallyShiftedAngularCoords as _getVerticallyShiftedAngularCoords import { Range } from '@ts/viz/translators/range'; import { Translator1D } from '@ts/viz/translators/translator1d'; -import { BaseChart, overlapping } from './chart_components/m_base_chart'; +import { BaseChart, overlapping } from './chart_components/base_chart'; const { states } = consts; const seriesSpacing = consts.pieSeriesSpacing; diff --git a/packages/devextreme/js/__internal/viz/m_polar_chart.ts b/packages/devextreme/js/__internal/viz/polar_chart.ts similarity index 96% rename from packages/devextreme/js/__internal/viz/m_polar_chart.ts rename to packages/devextreme/js/__internal/viz/polar_chart.ts index f445fea172d7..3cbeb9f2e29f 100644 --- a/packages/devextreme/js/__internal/viz/m_polar_chart.ts +++ b/packages/devextreme/js/__internal/viz/polar_chart.ts @@ -1,3 +1,7 @@ +/* eslint-disable @stylistic/max-len */ +/* eslint-disable @typescript-eslint/init-declarations */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ + import registerComponent from '@js/core/component_registrator'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; @@ -5,7 +9,7 @@ import { isDefined } from '@js/core/utils/type'; import { plugins } from '@ts/viz/core/annotations'; import { convertPolarToXY, normalizeAngle } from '@ts/viz/core/utils'; -import { AdvancedChart } from './chart_components/m_advanced_chart'; +import { AdvancedChart } from './chart_components/advanced_chart'; const DEFAULT_PANE_NAME = 'default'; const DOUBLE_PI_ANGLE = 360; diff --git a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts index 5830d445f0e5..3d0989cba714 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts @@ -40,10 +40,10 @@ import { Axis } from '@ts/viz/axes/base_axis'; import { tickGenerator } from '@ts/viz/axes/tick_generator'; import { correctValueType, getParser } from '@ts/viz/components/parse_utils'; // PLUGINS_SECTION +import baseWidgetModule from '@ts/viz/core/base_widget'; import { plugin as dataSourcePlugin } from '@ts/viz/core/data_source'; import { plugin as exportPlugin } from '@ts/viz/core/export'; import { plugin as LoadingIndicatorPlugin } from '@ts/viz/core/loading_indicator'; -import baseWidgetModule from '@ts/viz/core/m_base_widget'; import { plugin as titlePlugin } from '@ts/viz/core/title'; import { convertVisualRangeObject, diff --git a/packages/devextreme/js/__internal/viz/sankey/sankey.ts b/packages/devextreme/js/__internal/viz/sankey/sankey.ts index 75038745e141..3f13727caeba 100644 --- a/packages/devextreme/js/__internal/viz/sankey/sankey.ts +++ b/packages/devextreme/js/__internal/viz/sankey/sankey.ts @@ -14,8 +14,8 @@ import componentRegistrator from '@js/core/component_registrator'; import { noop } from '@js/core/utils/common'; import { isNumeric as _isNumber, isString as _isString } from '@js/core/utils/type'; +import baseWidget from '@ts/viz/core/base_widget'; import { plugin as pluginDataSource } from '@ts/viz/core/data_source'; -import baseWidget from '@ts/viz/core/m_base_widget'; import { COLOR_MODE_GRADIENT, COLOR_MODE_SOURCE, COLOR_MODE_TARGET } from '@ts/viz/sankey/constants'; import { layout as defaultLayoutBuilder } from '@ts/viz/sankey/layout'; import Link from '@ts/viz/sankey/link_item'; diff --git a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts index 1cddaca89ae5..0dce48f4aed5 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts @@ -19,8 +19,8 @@ import { extend } from '@js/core/utils/extend'; import { isFunction } from '@js/core/utils/type'; // PLUGINS_SECTION // T422022 +import BaseWidget from '@ts/viz/core/base_widget'; import { plugin } from '@ts/viz/core/export'; -import BaseWidget from '@ts/viz/core/m_base_widget'; // PLUGINS_SECTION import { plugin as tooltipPlugin } from '@ts/viz/core/tooltip'; import { pointInCanvas } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts index 504774cc0180..dcaa2879f687 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts @@ -25,8 +25,8 @@ import '@ts/viz/tree_map/colorizing.discrete'; import componentRegistrator from '@js/core/component_registrator'; import { noop as _noop } from '@js/core/utils/common'; // PLUGINS_SECTION +import baseWidget from '@ts/viz/core/base_widget'; import { plugin } from '@ts/viz/core/data_source'; -import baseWidget from '@ts/viz/core/m_base_widget'; import { patchFontOptions as _patchFontOptions } from '@ts/viz/core/utils'; import { getColorizer as _getColorizer, setDefaultColorizer } from '@ts/viz/tree_map/colorizing'; import { buildRectAppearance as _buildRectAppearance, buildTextAppearance as _buildTextAppearance } from '@ts/viz/tree_map/common'; diff --git a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts index b48df4699453..03888fa02791 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts @@ -18,9 +18,9 @@ import '@ts/viz/vector_map/projection'; import componentRegistrator from '@js/core/component_registrator'; // PLUGINS_SECTION import { plugins as annotationsPlugins } from '@ts/viz/core/annotations'; +import BaseWidget from '@ts/viz/core/base_widget'; import { plugin as ExportPlugin } from '@ts/viz/core/export'; import { plugin as LoadingIndicatorPlugin } from '@ts/viz/core/loading_indicator'; -import BaseWidget from '@ts/viz/core/m_base_widget'; import { plugin as TitlePlugin } from '@ts/viz/core/title'; import { plugin as TooltipPlugin } from '@ts/viz/core/tooltip'; import { parseScalar as _parseScalar } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/common/charts.js b/packages/devextreme/js/common/charts.js index a1bc79d27044..dd6a891c6e21 100644 --- a/packages/devextreme/js/common/charts.js +++ b/packages/devextreme/js/common/charts.js @@ -1,3 +1,3 @@ -import { registerPattern, registerGradient } from '../__internal/common/m_charts'; +import { registerPattern, registerGradient } from '../__internal/common/charts'; export { registerPattern, registerGradient }; diff --git a/packages/devextreme/js/viz/chart.js b/packages/devextreme/js/viz/chart.js index b0a4cd9582e2..164d4185e7a3 100644 --- a/packages/devextreme/js/viz/chart.js +++ b/packages/devextreme/js/viz/chart.js @@ -1,4 +1,4 @@ -import Chart from '../__internal/viz/m_chart'; +import Chart from '../__internal/viz/chart'; export default Chart; diff --git a/packages/devextreme/js/viz/pie_chart.js b/packages/devextreme/js/viz/pie_chart.js index d201940e5e7c..c2659d4b09b7 100644 --- a/packages/devextreme/js/viz/pie_chart.js +++ b/packages/devextreme/js/viz/pie_chart.js @@ -1,3 +1,3 @@ -import PieChart from '../__internal/viz/m_pie_chart'; +import PieChart from '../__internal/viz/pie_chart'; export default PieChart; diff --git a/packages/devextreme/js/viz/polar_chart.js b/packages/devextreme/js/viz/polar_chart.js index beac31883aed..f04bb9c9754b 100644 --- a/packages/devextreme/js/viz/polar_chart.js +++ b/packages/devextreme/js/viz/polar_chart.js @@ -1,3 +1,3 @@ -import PolarChart from '../__internal/viz/m_polar_chart'; +import PolarChart from '../__internal/viz/polar_chart'; export default PolarChart; diff --git a/packages/devextreme/testing/tests/DevExpress.common/charts.tests.js b/packages/devextreme/testing/tests/DevExpress.common/charts.tests.js index 6c7ff287bb62..8c3260a4ca9b 100644 --- a/packages/devextreme/testing/tests/DevExpress.common/charts.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.common/charts.tests.js @@ -1,5 +1,5 @@ import { registerPattern, registerGradient } from 'common/charts'; -import graphicObjects from '__internal/common/m_charts'; +import graphicObjects from '__internal/common/charts'; import utils from 'viz/core/utils_default'; diff --git a/packages/devextreme/testing/tests/DevExpress.serverSide/viz.tests.js b/packages/devextreme/testing/tests/DevExpress.serverSide/viz.tests.js index fcc7f3e2ef1b..1ac454d53912 100644 --- a/packages/devextreme/testing/tests/DevExpress.serverSide/viz.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.serverSide/viz.tests.js @@ -1,4 +1,4 @@ -import BaseWidget from '__internal/viz/core/m_base_widget'; +import BaseWidget from '__internal/viz/core/base_widget'; QUnit.module('Viz', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.integration.tests.js index 953ea43bdf2c..11d52bde6042 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.integration.tests.js @@ -7,7 +7,7 @@ import titleModule from 'viz/core/title'; import dxChart from 'viz/chart'; import dxPieChart from 'viz/pie_chart'; import dxPolarChart from 'viz/polar_chart'; -import { overlapping } from '__internal/viz/chart_components/m_base_chart'; +import { overlapping } from '__internal/viz/chart_components/base_chart'; import seriesFamilyModule from 'viz/core/series_family'; import { setupSeriesFamily } from '../../helpers/chartMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js index 21228dca29e3..98903e0642df 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js @@ -14,7 +14,7 @@ import { getTitleStub } from './chartParts/commons.js'; import { DataSource } from 'common/data/data_source/data_source'; -import { BaseChart } from '__internal/viz/chart_components/m_base_chart'; +import { BaseChart } from '__internal/viz/chart_components/base_chart'; import layoutManagerModule from 'viz/chart_components/layout_manager'; import trackerModule from 'viz/chart_components/tracker'; import dxChart from 'viz/chart'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part7.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part7.tests.js index 358b3781265e..4f947b7a2d25 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part7.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part7.tests.js @@ -14,7 +14,7 @@ import { ERROR_MESSAGES as dxErrors } from 'viz/core/errors_warnings'; import seriesModule from 'viz/series/base_series'; import dataValidatorModule from 'viz/components/data_validator'; import { MockSeries, categories, seriesMockData, MockTranslator } from '../../helpers/chartMocks.js'; -import graphicObjects from '__internal/common/m_charts'; +import graphicObjects from '__internal/common/charts'; $('
').appendTo('#qunit-fixture'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/charts.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/charts.tests.js index f4b7646b28dd..a2a66750d1db 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/charts.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/charts.tests.js @@ -1,6 +1,6 @@ import testGlobalExports from '../../helpers/publicModulesHelper.js'; -import * as AdvancedChartModule from '__internal/viz/chart_components/m_advanced_chart'; -import * as baseChartModule from '__internal/viz/chart_components/m_base_chart'; +import * as AdvancedChartModule from '__internal/viz/chart_components/advanced_chart'; +import * as baseChartModule from '__internal/viz/chart_components/base_chart'; import * as CrosshairModule from 'viz/chart_components/crosshair'; import * as LayoutManagerModule from 'viz/chart_components/layout_manager'; import multiAxesSynchronizer from '__internal/viz/chart_components/multi_axes_synchronizer'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js index 83d327892827..5678d675a517 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js @@ -18,7 +18,7 @@ import { } from './chartParts/commons.js'; import exportModule from '__internal/viz/core/exportModule'; import seriesModule from 'viz/series/base_series'; -import { BaseChart } from '__internal/viz/chart_components/m_base_chart'; +import { BaseChart } from '__internal/viz/chart_components/base_chart'; import * as labelModule from 'viz/series/points/label'; import dataValidatorModule from 'viz/components/data_validator'; import translator1DModule from 'viz/translators/translator1d'; @@ -32,7 +32,7 @@ import { insertMockFactory, restoreMockFactory, seriesMockData } from '../../helpers/chartMocks.js'; import TemplateManagerModule from '__internal/core/m_template_manager'; -import graphicObjects from '__internal/common/m_charts'; +import graphicObjects from '__internal/common/charts'; import eventsEngine from 'common/core/events/core/events_engine'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/baseWidget.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/baseWidget.tests.js index 50a92840e317..b77a35182bb9 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/baseWidget.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/baseWidget.tests.js @@ -8,7 +8,7 @@ import registerComponent from 'core/component_registrator'; import { logger } from 'core/utils/console'; import resizeObserverSingleton from 'core/resize_observer'; import { isFunction } from 'core/utils/type'; -import BaseWidget from '__internal/viz/core/m_base_widget'; +import BaseWidget from '__internal/viz/core/base_widget'; import { DEBUG_createEventTrigger, DEBUG_createResizeHandler } from '__internal/viz/core/base_widget.utils'; import { BaseThemeManager } from 'viz/core/base_theme_manager'; import rendererModule from 'viz/core/renderers/renderer_default'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.gauges/baseGauge.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.gauges/baseGauge.tests.js index 1580b25e7c7c..4ee430fb18e3 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.gauges/baseGauge.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.gauges/baseGauge.tests.js @@ -20,7 +20,7 @@ import tooltipModule from 'viz/core/tooltip'; import translator1DModule from 'viz/translators/translator1d'; import themeManagerModule from '__internal/viz/gauges/theme_manager'; import Tracker from '__internal/viz/gauges/tracker'; -import graphicObjects from '__internal/common/m_charts'; +import graphicObjects from '__internal/common/charts'; registerComponent('BaseGauge', BaseGauge); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/bullet.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/bullet.tests.js index ea47c46fc2ff..7918b96cbd85 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/bullet.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/bullet.tests.js @@ -9,7 +9,7 @@ import { import rendererModule from 'viz/core/renderers/renderer_default'; import translator2DModule from 'viz/translators/translator2d'; import tooltipModule from 'viz/core/tooltip'; -import BaseWidget from '__internal/viz/core/m_base_widget'; +import BaseWidget from '__internal/viz/core/base_widget'; import 'viz/bullet'; let StubTranslator; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js index 153c243c0412..c6bb2c091825 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js @@ -9,7 +9,7 @@ import { Tooltip } from '../../helpers/vizMocks.js'; import tooltipModule from 'viz/core/tooltip'; -import BaseWidget from '__internal/viz/core/m_base_widget'; +import BaseWidget from '__internal/viz/core/base_widget'; import rendererModule from 'viz/core/renderers/renderer_default'; import dataValidatorModule from 'viz/components/data_validator'; import translator2DModule from 'viz/translators/translator2d';