Skip to content

Commit b012cf6

Browse files
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into 25_2
# Conflicts: # pnpm-lock.yaml
2 parents c205246 + 6e98c69 commit b012cf6

File tree

42 files changed

+2634
-6785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2634
-6785
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import DataGrid, {
33
Column,
44
Paging,
55
Grouping,
6-
Ai,
6+
AI,
77
} from 'devextreme-react/data-grid';
88
import Popup, { Position } from 'devextreme-react/popup';
99
import { vehicles } from './data.ts';
@@ -91,7 +91,7 @@ export default function App() {
9191
fixedPosition="right"
9292
cssClass="ai__cell"
9393
>
94-
<Ai
94+
<AI
9595
mode="auto"
9696
noDataText="No data"
9797
prompt="Identify the country where the vehicle model is manufactured. When looking up a country, consider vehicle brand, model, and specifications."

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useState } from 'react';
22
import DataGrid, {
3-
Column, Paging, Grouping, Ai,
3+
Column, Paging, Grouping, AI,
44
} from 'devextreme-react/data-grid';
55
import Popup, { Position } from 'devextreme-react/popup';
66
import { vehicles } from './data.js';
@@ -83,7 +83,7 @@ export default function App() {
8383
fixedPosition="right"
8484
cssClass="ai__cell"
8585
>
86-
<Ai
86+
<AI
8787
mode="auto"
8888
noDataText="No data"
8989
prompt="Identify the country where the vehicle model is manufactured. When looking up a country, consider vehicle brand, model, and specifications."

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
fixedPosition="right"
5858
:width="200"
5959
>
60-
<DxAi
60+
<DxAI
6161
mode="auto"
6262
noDataText="No data"
6363
prompt="Identify the country where the vehicle model is manufactured.
@@ -87,7 +87,7 @@ When looking up a country, consider vehicle brand, model, and specifications."
8787

8888
<script setup lang="ts">
8989
import { ref } from 'vue';
90-
import { DxDataGrid, DxColumn, DxGrouping, DxPaging, DxAi } from 'devextreme-vue/data-grid';
90+
import { DxDataGrid, DxColumn, DxGrouping, DxPaging, DxAI } from 'devextreme-vue/data-grid';
9191
import { DxPopup, DxPosition } from 'devextreme-vue/popup';
9292
import { vehicles, type Vehicle } from './data.ts';
9393
import { aiIntegration } from './service.ts';

apps/demos/Demos/TreeList/AIColumns/React/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import TreeList, {
33
Column,
44
Scrolling,
55
Paging,
6-
Ai,
6+
AI,
77
} from 'devextreme-react/tree-list';
88
import { employees } from './data.ts';
99
import { aiIntegration } from './service.ts';
@@ -70,7 +70,7 @@ export default function App() {
7070
fixedPosition="right"
7171
cssClass="ai__cell"
7272
>
73-
<Ai
73+
<AI
7474
mode="auto"
7575
noDataText="No data"
7676
prompt="Identify the department where the employee works. Select from the following department list: 'Management', 'Human Resources', 'IT', 'Shipping', 'Support', 'Sales', 'Engineering'. Use 'Engineering' if you cannot find a better match."

apps/demos/Demos/TreeList/AIColumns/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import TreeList, {
3-
Column, Scrolling, Paging, Ai,
3+
Column, Scrolling, Paging, AI,
44
} from 'devextreme-react/tree-list';
55
import { employees } from './data.js';
66
import { aiIntegration } from './service.js';
@@ -69,7 +69,7 @@ export default function App() {
6969
fixedPosition="right"
7070
cssClass="ai__cell"
7171
>
72-
<Ai
72+
<AI
7373
mode="auto"
7474
noDataText="No data"
7575
prompt="Identify the department where the employee works. Select from the following department list: 'Management', 'Human Resources', 'IT', 'Shipping', 'Support', 'Sales', 'Engineering'. Use 'Engineering' if you cannot find a better match."

apps/demos/Demos/TreeList/AIColumns/Vue/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
fixedPosition="right"
6262
:width="180"
6363
>
64-
<DxAi
64+
<DxAI
6565
mode="auto"
6666
noDataText="No data"
6767
prompt="Identify the department where the employee works.
@@ -73,7 +73,7 @@ Select from the following department list: 'Management', 'Human Resources', 'IT'
7373
</template>
7474

7575
<script setup lang="ts">
76-
import { DxTreeList, DxColumn, DxScrolling, DxPaging, DxAi } from 'devextreme-vue/tree-list';
76+
import { DxTreeList, DxColumn, DxScrolling, DxPaging, DxAI } from 'devextreme-vue/tree-list';
7777
import Employee from './Employee.vue';
7878
import Status from './Status.vue';
7979
import { type IEmployee, employees } from './data.ts';

apps/demos/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@vue/shared": "^3.2.47",
3232
"canvg": "4.0.3",
3333
"cldr-core": "40.0.0",
34-
"cldr-data": "36.0.1",
34+
"cldr-data": "36.0.4",
3535
"cldr-dates-full": "40.0.0",
3636
"cldr-numbers-full": "40.0.0",
3737
"cldrjs": "0.5.5",

apps/react-storybook/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
"openai": "4.73.1"
2020
},
2121
"devDependencies": {
22-
"@storybook/addon-essentials": "7.6.19",
23-
"@storybook/addon-interactions": "7.6.19",
24-
"@storybook/addon-links": "7.6.19",
25-
"@storybook/blocks": "7.6.19",
26-
"@storybook/react": "7.6.19",
27-
"@storybook/react-webpack5": "7.6.19",
28-
"@storybook/test": "7.6.19",
22+
"@storybook/addon-essentials": "8.6.14",
23+
"@storybook/addon-interactions": "8.6.14",
24+
"@storybook/addon-links": "10.1.4",
25+
"@storybook/blocks": "8.6.14",
26+
"@storybook/react": "10.1.4",
27+
"@storybook/react-webpack5": "10.1.4",
28+
"@storybook/test": "8.6.14",
2929
"@types/react": "18.0.0",
3030
"@types/react-dom": "18.0.0",
3131
"http-server": "14.1.1",
3232
"prop-types": "15.8.1",
3333
"react": "18.0.0",
3434
"react-dom": "18.0.0",
35-
"storybook": "7.6.19",
35+
"storybook": "10.1.4",
3636
"typescript": "4.9.5"
3737
}
3838
}

e2e/bundlers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"cldrjs": "0.5.5",
1313
"jquery": "catalog:",
1414
"minimist": "1.2.8",
15-
"parcel": "2.12.0",
15+
"parcel": "2.16.1",
1616
"rimraf": "3.0.2",
1717
"rollup": "4.22.4",
1818
"vite": "5.4.19",

e2e/wrappers/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
"@angular-devkit/build-angular": "^19.2.5",
5757
"@angular/cli": "^19.2.5",
5858
"@angular/compiler-cli": "^19.2.0",
59-
"@eslint/js": "^9.21.0",
59+
"@eslint/js": "^9.39.1",
6060
"@types/jasmine": "~5.1.0",
6161
"@types/react": "^19.0.10",
6262
"@types/react-dom": "^19.0.4",
6363
"@vitejs/plugin-react": "^4.3.4",
6464
"@vitejs/plugin-vue": "^5.2.1",
65-
"eslint": "^9.21.0",
66-
"eslint-plugin-react-hooks": "^5.1.0",
67-
"eslint-plugin-react-refresh": "^0.4.19",
65+
"eslint": "^9.39.1",
66+
"eslint-plugin-react-hooks": "^7.0.1",
67+
"eslint-plugin-react-refresh": "^0.4.24",
6868
"globals": "^15.15.0",
6969
"jasmine-core": "~5.6.0",
7070
"karma": "~6.4.0",

0 commit comments

Comments
 (0)