Revert "Demos: update data imports"

This reverts commit fc01653.

apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts

@@ -4,7 +4,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { HttpClient, HttpClientModule, HttpParams } from '@angular/common/http';
 import { lastValueFrom } from 'rxjs';
 import { DxAutocompleteModule, DxTemplateModule } from 'devextreme-angular';
-import { CustomStore, ODataStore } from 'devextreme-angular/common/data';
+import CustomStore from 'devextreme/data/custom_store';
+import ODataStore from 'devextreme/data/odata/store';
 import { Service } from './app.service';
 
 if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/Autocomplete/Overview/React/App.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
-import { ODataStore, CustomStore } from 'devextreme-react/common/data/';
+import ODataStore from 'devextreme/data/odata/store';
 import { Autocomplete, AutocompleteTypes } from 'devextreme-react/autocomplete';
+import CustomStore from 'devextreme/data/custom_store';
 import 'whatwg-fetch';
 import { names, surnames, positions } from './data.ts';
 

apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js

@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
-import { ODataStore, CustomStore } from 'devextreme-react/common/data';
+import ODataStore from 'devextreme/data/odata/store';
 import { Autocomplete } from 'devextreme-react/autocomplete';
+import CustomStore from 'devextreme/data/custom_store';
 import 'whatwg-fetch';
 import { names, surnames, positions } from './data.js';
 

apps/demos/Demos/Autocomplete/Overview/Vue/App.vue

@@ -97,8 +97,9 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue';
-import { ODataStore, CustomStore } from 'devextreme-vue/common/data';
+import ODataStore from 'devextreme/data/odata/store';
 import { DxAutocomplete } from 'devextreme-vue/autocomplete';
+import CustomStore from 'devextreme/data/custom_store';
 import 'whatwg-fetch';
 import { names, surnames, positions } from './data.ts';
 

apps/demos/Demos/Charts/BarSparklines/Angular/app/app.component.ts

@@ -5,7 +5,8 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { lastValueFrom } from 'rxjs';
 
 import { DxSparklineModule, DxSelectBoxModule } from 'devextreme-angular';
-import { DataSource, CustomStore } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 
 if (!/localhost/.test(document.location.host)) {
   enableProdMode();

apps/demos/Demos/Charts/BarSparklines/React/App.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
 import SelectBox, { SelectBoxTypes } from 'devextreme-react/select-box';
-import { DataSource, CustomStore } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 import RowTemplate from './RowTemplate.tsx';
 
 const months = [12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1];

apps/demos/Demos/Charts/BarSparklines/React/RowTemplate.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import Sparkline, {
   Tooltip,
 } from 'devextreme-react/sparkline';
-import { DataSource } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
 
 interface RowTemplateProps {
   key: number;

apps/demos/Demos/Charts/BarSparklines/ReactJs/App.js

@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
 import SelectBox from 'devextreme-react/select-box';
-import { DataSource, CustomStore } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 import RowTemplate from './RowTemplate.js';
 
 const months = [12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1];

apps/demos/Demos/Charts/BarSparklines/Vue/App.vue

@@ -39,7 +39,8 @@
 
 <script setup lang="ts">
 import DxSelectBox from 'devextreme-vue/select-box';
-import { DataSource, CustomStore } from 'devextreme-vue/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 import RowTemplate from './RowTemplate.vue';
 
 const months = [12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1];

apps/demos/Demos/Charts/ClientSideDataProcessing/Angular/app/app.component.ts

@@ -7,7 +7,9 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { lastValueFrom } from 'rxjs';
 
 import { DxChartModule, DxSelectBoxModule } from 'devextreme-angular';
-import { DataSource, CustomStore, query } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
+import query from 'devextreme/data/query';
 
 if (!/localhost/.test(document.location.host)) {
   enableProdMode();

apps/demos/Demos/Charts/ClientSideDataProcessing/React/App.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { DataSource, CustomStore } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 import Chart, {
   ValueAxis, Label, Legend, Series, Size, Export, LoadingIndicator,
 } from 'devextreme-react/chart';

apps/demos/Demos/Charts/ClientSideDataProcessing/ReactJs/App.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { DataSource, CustomStore } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 import Chart, {
   ValueAxis,
   Label,

apps/demos/Demos/Charts/ClientSideDataProcessing/Vue/App.vue

@@ -45,7 +45,8 @@ import DxChart, {
   DxLoadingIndicator,
 } from 'devextreme-vue/chart';
 import DxSelectBox from 'devextreme-vue/select-box';
-import { DataSource, CustomStore } from 'devextreme-vue/common/data';
+import DataSource from 'devextreme/data/data_source';
+import CustomStore from 'devextreme/data/custom_store';
 
 const temperature = [2, 4, 6, 8, 9, 10, 11];
 const palette = ['#c3a2cc', '#b7b5e0', '#e48cba'];

apps/demos/Demos/Charts/LoadDataOnDemand/Angular/app/app.component.ts

@@ -7,7 +7,7 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { lastValueFrom } from 'rxjs';
 import { DxChartComponent, DxChartModule } from 'devextreme-angular';
 import { VisualRange } from 'devextreme-angular/common/charts';
-import { DataSource } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
 
 if (!/localhost/.test(document.location.host)) {
   enableProdMode();

apps/demos/Demos/Charts/LoadDataOnDemand/React/App.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { DataSource } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
 import {
   Chart,
   ChartTypes,

apps/demos/Demos/Charts/LoadDataOnDemand/ReactJs/App.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { DataSource } from 'devextreme-react/common/data';
+import DataSource from 'devextreme/data/data_source';
 import {
   Chart,
   ZoomAndPan,

apps/demos/Demos/Charts/LoadDataOnDemand/Vue/App.vue

@@ -54,7 +54,7 @@ import DxChart, {
   DxLoadingIndicator,
   DxLegend,
 } from 'devextreme-vue/chart';
-import { DataSource } from 'devextreme-vue/common/data';
+import DataSource from 'devextreme/data/data_source';
 import 'whatwg-fetch';
 
 const HALFDAY = 43200000;

apps/demos/Demos/Charts/LoadDataOnDemand/test-code.js

@@ -1,4 +1,4 @@
-testUtils.importAnd(() => ['devextreme/viz/chart', 'devextreme/common/data/data_source'], () => [DevExpress.viz.dxChart, DevExpress.data.DataSource], (dxChart, DataSource) => {
+testUtils.importAnd(() => ['devextreme/viz/chart', 'devextreme/data/data_source'], () => [DevExpress.viz.dxChart, DevExpress.data.DataSource], (dxChart, DataSource) => {
   window.checkReady = function () {
     const dataSource = dxChart.getInstance(document.querySelector('#chart')).getDataSource();
     return dataSource ? dataSource.items().length > 0 : false;

apps/demos/Demos/Charts/ServerSideDataProcessing/Angular/app/app.component.ts

@@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { DxChartModule, DxSelectBoxModule } from 'devextreme-angular';
-import { DataSource } from 'devextreme-angular/common/data';
-import 'devextreme-angular/common/data/odata/store';
+import DataSource from 'devextreme/data/data_source';
+import 'devextreme/data/odata/store';
 
 import { Month, Service } from './app.service';
 

apps/demos/Demos/Charts/ServerSideDataProcessing/React/App.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { DataSource } from 'devextreme-react/common/data';
-import 'devextreme-react/common/data/odata/store';
+import DataSource from 'devextreme/data/data_source';
+import 'devextreme/data/odata/store';
 import Chart, {
   ValueAxis,
   ArgumentAxis,

apps/demos/Demos/Charts/ServerSideDataProcessing/ReactJs/App.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { DataSource } from 'devextreme-react/common/data';
-import 'devextreme-react/common/data/odata/store';
+import DataSource from 'devextreme/data/data_source';
+import 'devextreme/data/odata/store';
 import Chart, {
   ValueAxis,
   ArgumentAxis,

apps/demos/Demos/Charts/ServerSideDataProcessing/Vue/App.vue

@@ -69,8 +69,8 @@ import DxChart, {
   DxLoadingIndicator,
 } from 'devextreme-vue/chart';
 import DxSelectBox from 'devextreme-vue/select-box';
-import { DataSource } from 'devextreme-vue/common/data';
-import 'devextreme-vue/common/data/odata/store';
+import DataSource from 'devextreme/data/data_source';
+import 'devextreme/data/odata/store';
 import { months } from './data.ts';
 
 const chartDataSource = new DataSource({

apps/demos/Demos/Charts/SignalRService/Angular/app/app.component.ts

@@ -5,7 +5,7 @@ import { DecimalPipe, CurrencyPipe } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { HubConnectionBuilder, HttpTransportType } from '@aspnet/signalr';
-import { CustomStore } from 'devextreme-angular/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 import { DxChartModule, DxChartComponent, DxChartTypes } from 'devextreme-angular/ui/chart';
 
 if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/Charts/SignalRService/React/App.tsx

@@ -18,7 +18,7 @@ import Chart, {
   IAggregationProps,
 } from 'devextreme-react/chart';
 import { VisualRange } from 'devextreme-react/common/charts';
-import { CustomStore } from 'devextreme-react/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 import { HubConnectionBuilder, HttpTransportType } from '@aspnet/signalr';
 import TooltipTemplate from './TooltipTemplate.tsx';
 

apps/demos/Demos/Charts/SignalRService/ReactJs/App.js

@@ -16,7 +16,7 @@ import Chart, {
   Margin,
   HorizontalLine,
 } from 'devextreme-react/chart';
-import { CustomStore } from 'devextreme-react/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 import { HubConnectionBuilder, HttpTransportType } from '@aspnet/signalr';
 import TooltipTemplate from './TooltipTemplate.js';
 

apps/demos/Demos/Charts/SignalRService/Vue/App.vue

@@ -82,7 +82,7 @@ import {
   DxTooltip,
   DxCrosshair,
 } from 'devextreme-vue/chart';
-import { CustomStore } from 'devextreme-vue/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 import { HubConnectionBuilder, HttpTransportType } from '@aspnet/signalr';
 import TooltipTemplate from './TooltipTemplate.vue';
 

apps/demos/Demos/Common/ActionAndListsOverview/Angular/app/app.component.ts

@@ -2,7 +2,7 @@ import { NgModule, Component, enableProdMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { DxTileViewModule, DxButtonModule, DxListModule } from 'devextreme-angular';
-import { DataSource } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
 
 import { Service, Hotel } from './app.service';
 

apps/demos/Demos/Common/ActionAndListsOverview/Angular/app/app.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { ArrayStore, DataSource } from 'devextreme-angular/common/data';
+import ArrayStore from 'devextreme/data/array_store';
+import DataSource from 'devextreme/data/data_source';
 
 export class Hotel {
   Id: number;

apps/demos/Demos/Common/ActionAndListsOverview/React/App.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { ArrayStore } from 'devextreme-react/common/data';
+import ArrayStore from 'devextreme/data/array_store';
 import List, { ListTypes } from 'devextreme-react/list';
 import TileView from 'devextreme-react/tile-view';
 import { data } from './data.ts';

apps/demos/Demos/Common/ActionAndListsOverview/ReactJs/App.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { ArrayStore } from 'devextreme-react/common/data';
+import ArrayStore from 'devextreme/data/array_store';
 import List from 'devextreme-react/list';
 import TileView from 'devextreme-react/tile-view';
 import { data } from './data.js';

apps/demos/Demos/Common/ActionAndListsOverview/Vue/App.vue

@@ -71,7 +71,7 @@
 import { ref } from 'vue';
 import DxTileView from 'devextreme-vue/tile-view';
 import DxList from 'devextreme-vue/list';
-import { ArrayStore } from 'devextreme-vue/common/data';
+import ArrayStore from 'devextreme/data/array_store';
 import { data } from './data.ts';
 
 const currentHotel = ref(data[0]);

apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/app.component.ts

@@ -5,7 +5,7 @@ import {
   DxDataGridModule, DxFormModule, DxSelectBoxModule, DxTabPanelModule,
 } from 'devextreme-angular';
 import * as AspNetData from 'devextreme-aspnet-data-nojquery';
-import { DataSource } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
 import { DetailViewComponent } from './detail-view/detail-view.component';
 
 if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/detail-view/detail-view.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, AfterViewInit } from '@angular/core';
-import { DataSource } from 'devextreme-angular/common/data';
+import DataSource from 'devextreme/data/data_source';
 import * as AspNetData from 'devextreme-aspnet-data-nojquery';
 import { DxFormTypes } from 'devextreme-angular/ui/form';
 import { DxSelectBoxTypes } from 'devextreme-angular/ui/select-box';

apps/demos/Demos/DataGrid/CRUDOperations/Angular/app/app.component.ts

@@ -4,8 +4,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { HttpClient, HttpClientModule, HttpParams } from '@angular/common/http';
 import { lastValueFrom, Observable } from 'rxjs';
 import { DxDataGridModule, DxSelectBoxModule, DxButtonModule } from 'devextreme-angular';
-import { CustomStore } from 'devextreme-angular/common/data';
-import { formatDate } from 'devextreme/common/core/localization';
+import CustomStore from 'devextreme/data/custom_store';
+import { formatDate } from 'devextreme/localization';
 
 if (!/localhost/.test(document.location.host)) {
   enableProdMode();

apps/demos/Demos/DataGrid/CRUDOperations/React/App.tsx

@@ -7,8 +7,8 @@ import {
 import { Button } from 'devextreme-react/button';
 import { SelectBox, SelectBoxTypes } from 'devextreme-react/select-box';
 
-import { CustomStore } from 'devextreme-react/common/data';
-import { formatDate } from 'devextreme/common/core/localization';
+import CustomStore from 'devextreme/data/custom_store';
+import { formatDate } from 'devextreme/localization';
 import 'whatwg-fetch';
 
 const refreshModeLabel = { 'aria-label': 'Refresh Mode' };

apps/demos/Demos/DataGrid/CRUDOperations/ReactJs/App.js

@@ -12,8 +12,8 @@ import {
 } from 'devextreme-react/data-grid';
 import { Button } from 'devextreme-react/button';
 import { SelectBox } from 'devextreme-react/select-box';
-import { CustomStore } from 'devextreme-react/common/data';
-import { formatDate } from 'devextreme/common/core/localization';
+import CustomStore from 'devextreme/data/custom_store';
+import { formatDate } from 'devextreme/localization';
 import 'whatwg-fetch';
 
 const refreshModeLabel = { 'aria-label': 'Refresh Mode' };

apps/demos/Demos/DataGrid/CRUDOperations/Vue/App.vue

@@ -95,8 +95,8 @@ import {
 } from 'devextreme-vue/data-grid';
 import { DxButton } from 'devextreme-vue/button';
 import { DxSelectBox } from 'devextreme-vue/select-box';
-import { CustomStore } from 'devextreme-vue/common/data';
-import { formatDate } from 'devextreme/common/core/localization';
+import CustomStore from 'devextreme/data/custom_store';
+import { formatDate } from 'devextreme/localization';
 import 'whatwg-fetch';
 
 const URL = 'https://js.devexpress.com/Demos/Mvc/api/DataGridWebApi';

apps/demos/Demos/DataGrid/CellEditingAndEditingAPI/Angular/app/app.component.ts

@@ -4,7 +4,7 @@ import {
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { DxButtonModule } from 'devextreme-angular';
-import { ArrayStore } from 'devextreme-angular/common/data';
+import ArrayStore from 'devextreme/data/array_store';
 import { DxDataGridModule, DxDataGridComponent, DxDataGridTypes } from 'devextreme-angular/ui/data-grid';
 import { Service, State } from './app.service';
 

apps/demos/Demos/DataGrid/CellEditingAndEditingAPI/React/App.tsx

@@ -3,7 +3,8 @@ import DataGrid, {
   Column, Editing, Paging, Selection, Lookup, Toolbar, Item, DataGridTypes,
 } from 'devextreme-react/data-grid';
 import { Button } from 'devextreme-react/button';
-import { ArrayStore, DataSource } from 'devextreme-react/common/data';
+import ArrayStore from 'devextreme/data/array_store';
+import DataSource from 'devextreme/data/data_source';
 import { employees, states } from './data.ts';
 
 const dataSource = new DataSource({

apps/demos/Demos/DataGrid/CellEditingAndEditingAPI/ReactJs/App.js

@@ -9,7 +9,8 @@ import DataGrid, {
   Item,
 } from 'devextreme-react/data-grid';
 import { Button } from 'devextreme-react/button';
-import { ArrayStore, DataSource } from 'devextreme-react/common/data';
+import ArrayStore from 'devextreme/data/array_store';
+import DataSource from 'devextreme/data/data_source';
 import { employees, states } from './data.js';
 
 const dataSource = new DataSource({

apps/demos/Demos/DataGrid/CellEditingAndEditingAPI/Vue/App.vue

@@ -79,7 +79,8 @@ import {
 } from 'devextreme-vue/data-grid';
 import { DxButton } from 'devextreme-vue/button';
 
-import { DataSource, ArrayStore } from 'devextreme-vue/common/data';
+import DataSource from 'devextreme/data/data_source';
+import ArrayStore from 'devextreme/data/array_store';
 
 import { Employee, employees, states } from './data.ts';
 

apps/demos/Demos/DataGrid/CollaborativeEditing/Angular/app/app.component.ts

@@ -2,7 +2,7 @@ import { NgModule, Component, enableProdMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { DxDataGridModule, DxTextBoxModule } from 'devextreme-angular';
-import { CustomStore } from 'devextreme-angular/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 import { CollaborativeEditingService } from './app.service';
 
 if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/DataGrid/CollaborativeEditing/Vue/Grid.vue

@@ -59,7 +59,7 @@ import {
 } from 'devextreme-vue/data-grid';
 
 import * as AspNetData from 'devextreme-aspnet-data-nojquery';
-import { CustomStore } from 'devextreme-vue/common/data';
+import CustomStore from 'devextreme/data/custom_store';
 
 defineProps<{
   dataSource: CustomStore