devextreme-cli 1.13.0 → 1.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.13.0",
+  "version": "1.14.1",
   "description": "DevExtreme CLI",
   "keywords": [
     "devexpress",
@@ -43,7 +43,7 @@
     "minimist": "^1.2.8",
     "mustache": "^3.2.1",
     "prompts": "^2.4.2",
-    "sass": "^1.97.1",
+    "sass": "^1.97.3",
     "semver": "^5.7.2",
     "strip-bom": "^4.0.0"
   },
@@ -77,5 +77,5 @@
     "@babel/traverse@<7.23.2": ">=7.23.2",
     "braces@<3.0.3": ">=3.0.3"
   },
-  "gitHead": "51bbc8d2fbfa40b741792c6921e27429cdb04c6f"
+  "gitHead": "1f3ffa8ec11b0545d13e3fc2ec20b0c7fdae178b"
 }

package/src/applications/application.angular.js

@@ -63,40 +63,6 @@ function localPackageExists(packageName) {
     return false;
 }
 
-function getLocalCollectionPath(packageName) {
-    const nodeModulesPath = path.join(process.cwd(), 'node_modules', packageName, 'src', 'collection.json');
-    if(fs.existsSync(nodeModulesPath)) {
-        return nodeModulesPath;
-    }
-    return null;
-}
-
-function getCollectionPath(packageName) {
-    const localPath = getLocalCollectionPath(packageName);
-    if(localPath) {
-        return localPath;
-    }
-
-    try {
-        const packageJsonPath = require.resolve(`${packageName}/package.json`);
-        const collectionPath = path.join(path.dirname(packageJsonPath), 'src', 'collection.json');
-        if(fs.existsSync(collectionPath)) {
-            return collectionPath;
-        }
-    } catch(e) {}
-
-    return null;
-}
-
-function schematicsCliExists() {
-    try {
-        require.resolve('@angular-devkit/schematics-cli/package.json');
-        return true;
-    } catch(e) {
-        return false;
-    }
-}
-
 const hasSutableNgCli = async() => {
     const localVersion = ngVersion.getLocalNgVersion();
 
@@ -189,44 +155,17 @@ const addView = (viewName, options) => {
 
 const migrateConfigComponents = async(options = {}) => {
     const collectionName = 'devextreme-schematics';
-    const collectionPath = getCollectionPath(collectionName);
-
-    if(!collectionPath) {
-        const prompts = require('prompts');
-
-        console.log(`\nRequired package is missing: '${collectionName}'`);
-
-        const response = await prompts({
-            type: 'confirm',
-            name: 'install',
-            message: `Would you like to install '${collectionName}@${schematicsVersion}' in the npm cache?`,
-            initial: true
-        });
-
-        if(!response.install) {
-            console.log('Migration was canceled.');
-            process.exit(1);
-        }
-    }
 
     const schematicOptions = {
         ...options
     };
 
-    const hasSchematicsCli = schematicsCliExists();
     const commandArguments = ['--yes'];
 
-    if(!hasSchematicsCli) {
-        commandArguments.push('-p', '@angular-devkit/schematics-cli');
-    }
-
-    if(!collectionPath) {
-        commandArguments.push('-p', `${collectionName}@${schematicsVersion}`);
-    }
+    commandArguments.push('-p', '@angular-devkit/schematics-cli');
+    commandArguments.push('-p', `${collectionName}@${schematicsVersion}`);
 
-    const collectionSpecifier = collectionPath
-        ? `${collectionPath.replace(/\\/g, '/')}:migrate-config-components`
-        : `${collectionName}:migrate-config-components`;
+    const collectionSpecifier = `${collectionName}:migrate-config-components`;
 
     commandArguments.push('schematics', collectionSpecifier);
 

package/src/templates/nextjs/sample-pages/tasks/page.tsx

@@ -1,12 +1,11 @@
 'use client'
 import React from 'react';
-import { DataSource } from 'devextreme-react/common/data';
+import { CustomStore } from 'devextreme-react/common/data';
 import DataGrid, {
   Column,
   Pager,
   Paging,
   FilterRow,
-  Lookup
 } from 'devextreme-react/data-grid';
 import './tasks.scss';
 
@@ -28,85 +27,61 @@ export default function Task() {
         <Pager showPageSizeSelector={true} showInfo={true} />
         <FilterRow visible={true} />
 
-        <Column dataField={'Task_ID'} width={90} hidingPriority={2} />
+        <Column dataField={'id'} width={90} hidingPriority={1} />
         <Column
-          dataField={'Task_Subject'}
+          dataField={'text'}
           width={190}
           caption={'Subject'}
-          hidingPriority={8}
+          hidingPriority={6}
         />
         <Column
-          dataField={'Task_Status'}
+          dataField={'status'}
           caption={'Status'}
-          hidingPriority={6}
+          hidingPriority={4}
         />
         <Column
-          dataField={'Task_Priority'}
-          caption={'Priority'}
-          hidingPriority={5}
-        >
-          <Lookup
-            dataSource={priorities}
-            valueExpr={'value'}
-            displayExpr={'name'}
-          />
-        </Column>
-        <Column
-          dataField={'ResponsibleEmployee.Employee_Full_Name'}
+          dataField={'owner'}
           caption={'Assigned To'}
           allowSorting={false}
-          hidingPriority={7}
+          hidingPriority={5}
         />
         <Column
-          dataField={'Task_Start_Date'}
+          dataField={'startDate'}
           caption={'Start Date'}
           dataType={'date'}
-          hidingPriority={3}
+          hidingPriority={2}
         />
         <Column
-          dataField={'Task_Due_Date'}
+          dataField={'dueDate'}
           caption={'Due Date'}
           dataType={'date'}
-          hidingPriority={4}
+          hidingPriority={3}
         />
         <Column
-          dataField={'Task_Priority'}
+          dataField={'priority'}
           caption={'Priority'}
           name={'Priority'}
-          hidingPriority={1}
-        />
-        <Column
-          dataField={'Task_Completion'}
-          caption={'Completion'}
           hidingPriority={0}
         />
       </DataGrid>
     </React.Fragment>
 )}
 
-const dataSource = new DataSource({
-  store: {
-    version: 2,
-    type: 'odata',
-    key: 'Task_ID',
-    url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
-  },
-  expand: 'ResponsibleEmployee',
-  select: [
-    'Task_ID',
-    'Task_Subject',
-    'Task_Start_Date',
-    'Task_Due_Date',
-    'Task_Status',
-    'Task_Priority',
-    'Task_Completion',
-    'ResponsibleEmployee/Employee_Full_Name'
-  ]
-});
+const dataSource = {
+  store: new CustomStore({
+    key: 'id',
+    async load() {
+      try {
+        const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
+
+        const result = await response.json();
 
-const priorities = [
-  { name: 'High', value: 4 },
-  { name: 'Urgent', value: 3 },
-  { name: 'Normal', value: 2 },
-  { name: 'Low', value: 1 }
-];
+        return {
+          data: result,
+        };
+      } catch (err) {
+        throw new Error('Data Loading Error');
+      }
+    },
+  }),
+};

package/src/templates/react/sample-pages/tasks/tasks.tsx

@@ -1,11 +1,10 @@
 import React from 'react';
-import { DataSource } from 'devextreme-react/common/data';
+import { CustomStore } from 'devextreme-react/common/data';
 import DataGrid, {
   Column,
   Pager,
   Paging,
   FilterRow,
-  Lookup
 } from 'devextreme-react/data-grid';
 import './tasks.scss';
 
@@ -27,85 +26,61 @@ export function Tasks() {
         <Pager showPageSizeSelector={true} showInfo={true} />
         <FilterRow visible={true} />
 
-        <Column dataField={'Task_ID'} width={90} hidingPriority={2} />
+        <Column dataField={'id'} width={90} hidingPriority={1} />
         <Column
-          dataField={'Task_Subject'}
+          dataField={'text'}
           width={190}
           caption={'Subject'}
-          hidingPriority={8}
+          hidingPriority={6}
         />
         <Column
-          dataField={'Task_Status'}
+          dataField={'status'}
           caption={'Status'}
-          hidingPriority={6}
+          hidingPriority={4}
         />
         <Column
-          dataField={'Task_Priority'}
-          caption={'Priority'}
-          hidingPriority={5}
-        >
-          <Lookup
-            dataSource={priorities}
-            valueExpr={'value'}
-            displayExpr={'name'}
-          />
-        </Column>
-        <Column
-          dataField={'ResponsibleEmployee.Employee_Full_Name'}
+          dataField={'owner'}
           caption={'Assigned To'}
           allowSorting={false}
-          hidingPriority={7}
+          hidingPriority={5}
         />
         <Column
-          dataField={'Task_Start_Date'}
+          dataField={'startDate'}
           caption={'Start Date'}
           dataType={'date'}
-          hidingPriority={3}
+          hidingPriority={2}
         />
         <Column
-          dataField={'Task_Due_Date'}
+          dataField={'dueDate'}
           caption={'Due Date'}
           dataType={'date'}
-          hidingPriority={4}
+          hidingPriority={3}
         />
         <Column
-          dataField={'Task_Priority'}
+          dataField={'priority'}
           caption={'Priority'}
           name={'Priority'}
-          hidingPriority={1}
-        />
-        <Column
-          dataField={'Task_Completion'}
-          caption={'Completion'}
           hidingPriority={0}
         />
       </DataGrid>
     </React.Fragment>
 )}
 
-const dataSource = new DataSource({
-  store: {
-    version: 2,
-    type: 'odata',
-    key: 'Task_ID',
-    url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
-  },
-  expand: 'ResponsibleEmployee',
-  select: [
-    'Task_ID',
-    'Task_Subject',
-    'Task_Start_Date',
-    'Task_Due_Date',
-    'Task_Status',
-    'Task_Priority',
-    'Task_Completion',
-    'ResponsibleEmployee/Employee_Full_Name'
-  ]
-});
+const dataSource = {
+  store: new CustomStore({
+    key: 'id',
+    async load() {
+      try {
+        const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
+
+        const result = await response.json();
 
-const priorities = [
-  { name: 'High', value: 4 },
-  { name: 'Urgent', value: 3 },
-  { name: 'Normal', value: 2 },
-  { name: 'Low', value: 1 }
-];
+        return {
+          data: result,
+        };
+      } catch {
+        throw new Error(`Data Loading Error`);
+      }
+    },
+  })
+};

package/src/templates/vue-v3/sample-pages/tasks-page.vue

@@ -15,64 +15,46 @@
       <dx-pager :show-page-size-selector="true" :show-info="true" />
       <dx-filter-row :visible="true" />
 
-      <dx-column data-field="Task_ID" :width="90" :hiding-priority="2" />
+      <dx-column data-field="id" :width="90" :hiding-priority="1" />
 
       <dx-column
-        data-field="Task_Subject"
+        data-field="text"
         caption="Subject"
         :width="190"
-        :hiding-priority="8"
+        :hiding-priority="6"
       />
 
       <dx-column
-        data-field="Task_Status"
+        data-field="status"
         caption="Status"
-        :hiding-priority="6"
+        :hiding-priority="4"
       />
 
       <dx-column
-        data-field="Task_Priority"
-        caption="Priority"
-        :hiding-priority="5"
-      >
-        <dx-lookup
-          display-expr="name"
-          value-expr="value"
-          :data-source="priorities"
-        />
-      </dx-column>
-
-      <dx-column
-        data-field="ResponsibleEmployee.Employee_Full_Name"
+        data-field="owner"
         caption="Assigned To"
         :allow-sorting="false"
-        :hiding-priority="7"
+        :hiding-priority="5"
       />
 
       <dx-column
-        data-field="Task_Start_Date"
+        data-field="startDate"
         caption="Start Date"
         data-type="date"
-        :hiding-priority="3"
+        :hiding-priority="2"
       />
 
       <dx-column
-        data-field="Task_Due_Date"
+        data-field="dueDate"
         caption="Due Date"
         data-type="date"
-        :hiding-priority="4"
+        :hiding-priority="3"
       />
 
       <dx-column
-        data-field="Task_Priority"
+        data-field="priority"
         caption="Priority"
         name="Priority"
-        :hiding-priority="1"
-      />
-
-      <dx-column
-        data-field="Task_Completion"
-        caption="Completion"
         :hiding-priority="0"
       />
     </dx-data-grid>
@@ -80,53 +62,42 @@
 </template>
 
 <script>
-import "devextreme-vue/common/data";
+import { CustomStore } from 'devextreme-vue/common/data';
 import DxDataGrid, {
   DxColumn,
   DxFilterRow,
-  DxLookup,
   DxPager,
   DxPaging
 } from "devextreme-vue/data-grid";
 
-const priorities = [
-  { name: "High", value: 4 },
-  { name: "Urgent", value: 3 },
-  { name: "Normal", value: 2 },
-  { name: "Low", value: 1 }
-];
-
 export default {
   setup() {
     const dataSourceConfig = {
-      store: {
-        version: 2,
-        type: "odata",
-        key: "Task_ID",
-        url: "https://js.devexpress.com/Demos/DevAV/odata/Tasks"
-      },
-      expand: "ResponsibleEmployee",
-      select: [
-        "Task_ID",
-        "Task_Subject",
-        "Task_Start_Date",
-        "Task_Due_Date",
-        "Task_Status",
-        "Task_Priority",
-        "Task_Completion",
-        "ResponsibleEmployee/Employee_Full_Name"
-      ]
+      store: new CustomStore({
+        key: 'id',
+        async load() {
+          try {
+            const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
+
+            const result = await response.json();
+
+            return {
+              data: result,
+            };
+          } catch (err) {
+            throw new Error('Data Loading Error');
+          }
+        },
+      }),
     };
     return {
       dataSourceConfig,
-      priorities
     };
   },
   components: {
     DxDataGrid,
     DxColumn,
     DxFilterRow,
-    DxLookup,
     DxPager,
     DxPaging
   }

package/src/utility/latest-versions.js

@@ -1,8 +1,8 @@
 const packageJson = require('../../package.json');
 module.exports = {
-    'devextreme': '25.2.3',
-    'devextreme-react': '25.2.3',
-    'devextreme-vue': '25.2.3',
+    'devextreme': '25.2.4',
+    'devextreme-react': '25.2.4',
+    'devextreme-vue': '25.2.4',
     'create-vite': '8.2.0',
     'create-vue': '3.17.0',
     'create-next-app': '16.1.0',