Skip to content

Commit a59b638

Browse files
committed
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into chatFuDesignUpdates__25_2
2 parents bb26666 + 8d9ffd4 commit a59b638

File tree

537 files changed

+4659
-2161
lines changed

Some content is hidden

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

537 files changed

+4659
-2161
lines changed

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
needs: check-should-run
3636
if: needs.check-should-run.outputs.should-run == 'true'
3737
env:
38-
NODE_OPTIONS: "--max-old-space-size=8192"
38+
NODE_OPTIONS: --max-old-space-size=8192
3939
timeout-minutes: 40
4040

4141
steps:
@@ -152,7 +152,7 @@ jobs:
152152
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
153153
working-directory: apps/demos
154154
env:
155-
NODE_OPTIONS: "--max-old-space-size=8192"
155+
NODE_OPTIONS: --max-old-space-size=8192
156156
run: pnpx nx prepare-bundles
157157

158158
- name: Demos - Run tsc

.github/workflows/qunit_tests.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,15 @@ jobs:
148148
matrix:
149149
constel: [
150150
'ui',
151-
'ui.widgets(1/3)',
152-
'ui.widgets(2/3)',
153-
'ui.widgets(3/3)',
151+
'ui.widgets(1/2)',
152+
'ui.widgets(2/2)',
154153
'ui.editors(1/2)',
155154
'ui.editors(2/2)',
156155
'ui.htmlEditor',
157-
'ui.grid(1/4)',
158-
'ui.grid(2/4)',
159-
'ui.grid(3/4)',
160-
'ui.grid(4/4)',
161-
'ui.scheduler(1/3)',
162-
'ui.scheduler(2/3)',
163-
'ui.scheduler(3/3)',
156+
'ui.grid(1/2)',
157+
'ui.grid(2/2)',
158+
'ui.scheduler(1/2)',
159+
'ui.scheduler(2/2)',
164160
'viz'
165161
]
166162

.github/workflows/testcafe_tests.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ jobs:
7070

7171
- name: Build
7272
shell: bash
73-
run: pnpx nx build devextreme
73+
env:
74+
NODE_OPTIONS: --max-old-space-size=8192
75+
run: pnpx nx build devextreme --uglify
7476

7577
- name: Zip artifacts
7678
working-directory: ./packages/devextreme
@@ -92,18 +94,13 @@ jobs:
9294
fail-fast: false
9395
matrix:
9496
ARGS: [
95-
{ componentFolder: "accessibility", name: "accessibility (1/2)", indices: "1/2" },
96-
{ componentFolder: "accessibility", name: "accessibility (2/2)", indices: "2/2" },
97+
{ componentFolder: "accessibility", name: "accessibility" },
9798
{ componentFolder: "common", name: "common" },
9899

99100
# Grids tests need to be reworked to work in fluent theme
100-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (1/5)", indices: "1/5" },
101-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (2/5)", indices: "2/5" },
102-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
103-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (4/5)", indices: "4/5" },
104-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (5/5)", indices: "5/5" },
105-
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
106-
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
101+
{ componentFolder: "dataGrid", name: "dataGrid (1/3)", indices: "1/3" },
102+
{ componentFolder: "dataGrid", name: "dataGrid (2/3)", indices: "2/3" },
103+
{ componentFolder: "dataGrid", name: "dataGrid (3/3)", indices: "3/3" },
107104
{ componentFolder: "cardView", name: "cardView" },
108105

109106
# Scheduler tests need to be reworked to work in fluent theme
@@ -162,8 +159,8 @@ jobs:
162159
run: |
163160
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
164161
165-
- uses: actions/cache@v4
166-
name: Setup pnpm cache
162+
- uses: actions/cache/restore@v4
163+
name: Restore pnpm cache
167164
with:
168165
path: |
169166
${{ env.STORE_PATH }}
@@ -177,6 +174,8 @@ jobs:
177174

178175
- name: Run TestCafe tests
179176
working-directory: ./e2e/testcafe-devextreme
177+
env:
178+
NODE_OPTIONS: --max-old-space-size=8192
180179
run: |
181180
if [ "${{ matrix.ARGS.theme }}" != "" ]; then
182181
THEME="--theme ${{ matrix.ARGS.theme }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class AppComponent {
117117
onResult({ event }) {
118118
const { results } = event;
119119
const resultText = Object.values(results)
120-
.map((resultItem) => resultItem[0].transcript)
120+
.map((resultItem) => resultItem[0].transcript.trim())
121121
.join(' ');
122122
this.textAreaValue = resultText;
123123
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default function App() {
7575
const onResult = useCallback(({ event }) => {
7676
const { results } = event;
7777
const resultText = Object.values(results)
78-
.map((resultItem: any) => resultItem[0].transcript)
78+
.map((resultItem: any) => resultItem[0].transcript.trim())
7979
.join(' ');
8080
setTextAreaValue(resultText);
8181
}, []);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default function App() {
6262
const onResult = useCallback(({ event }) => {
6363
const { results } = event;
6464
const resultText = Object.values(results)
65-
.map((resultItem) => resultItem[0].transcript)
65+
.map((resultItem) => resultItem[0].transcript.trim())
6666
.join(' ');
6767
setTextAreaValue(resultText);
6868
}, []);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function onStopClick() {
162162
function onResult({ event }: Record<string, any>) {
163163
const { results } = event;
164164
const resultText = Object.values(results)
165-
.map((resultItem: any) => resultItem[0].transcript)
165+
.map((resultItem: any) => resultItem[0].transcript.trim())
166166
.join(' ');
167167
textAreaValue.value = resultText;
168168

apps/demos/Demos/SpeechToText/Overview/jQuery/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $(() => {
4343
onResult: ({ event }) => {
4444
const { results } = event;
4545
const resultText = Object.values(results)
46-
.map((resultItem) => resultItem[0].transcript)
46+
.map((resultItem) => resultItem[0].transcript.trim())
4747
.join(' ');
4848

4949
textArea.option('value', resultText);

apps/demos/README.md

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,68 @@
11
# DevExtreme Demos
22

3-
This repository contains technical DevExtreme demos for Angular, React, Vue, jQuery, ASP.NET MVC, and ASP.NET Core.
3+
This repository contains technical DevExtreme demos for Angular, React, Vue, and jQuery.
44

55
To run the demos on your machine, clone this repository, run `pnpm install`, and follow the instructions below.
66

77
## Prepare Demos for Development
8-
Before running you need execute in `monorepo/root`:
98

10-
```
11-
pnpm run all:build-dev
12-
```
9+
### Run demos locally
1310

14-
To prepare demos for development:
11+
In `monorepo/root`
1512

13+
Build all dependencies and prepare systemJS configs by executing:
1614
```
17-
pnpm run prepare-js
15+
pnpm run demos:prepare
1816
```
1917

20-
Angular, Vue, and React demos can use bundles instead of separate files from `node_modules`. With bundles, demos launch faster but become harder to debug. Run the following command to create the bundles and replace the SystemJS configuration:
21-
18+
Start webserver:
2219
```
23-
pnpm run prepare-bundles
20+
pnpm run demos:start
2421
```
22+
Navigate to http://localhost:8080/.
23+
24+
You can pass additional parameter to specify port. It can be useful when you need to fast switching between one demo on different frameworks.
25+
2526

26-
To return to using separate files from `node_modules`, run `pnpm run prepare-js`.
27+
### Bundled mode
2728

29+
Angular, Vue, and React demos can use bundles instead of separate files from `node_modules`. With bundles, demos launch faster but become harder to debug.
2830

29-
### Launch
31+
In `apps/demos`
32+
33+
Run the following command to create the bundles and replace the SystemJS configuration:
3034

31-
#### Option 1
3235
```
33-
pnpm run launch-demo
36+
pnpm run prepare-bundles
3437
```
3538

36-
#### Option 2
37-
1. Run ```pnpm run webserver ``` from `monorepo/root`
38-
2. Navigate to http://localhost:8080/apps/demos.
39+
To return to using separate files from `node_modules`, run:
3940

40-
You can pass additional parameter to specify port. It can be useful when you need to fast switching between one demo on different frameworks:
41+
```
42+
pnpm run prepare-js
43+
```
4144

42-
### Before Commiting Сhanges
45+
### Before Commiting Changes
4346

44-
For fix autofixed errors:
47+
Auto-fix lint errors:
4548

4649
```
4750
pnpm run fix-lint
4851
```
4952

50-
### Development
53+
### Adding new demo
5154

5255
1. Run the following script to add a new demo:
5356

5457
```
5558
pnpm run add-demo
5659
```
5760
58-
1. Use the built-in CLI to choose or enter the category, the demo name, and the technology for the new demo.
61+
2. Use the built-in CLI to choose or enter the category, the demo name, and the technology for the new demo.
5962
6063
### TS React Infrastructure
6164
62-
1. After you make any changes in React TypeScript sources, run the following command:
65+
After you make any changes in React TypeScript sources, run the following command:
6366
6467
```
6568
pnpm run convert-to-js split
@@ -71,9 +74,7 @@ If you want to run this script on specific folder you can pass it to the argumen
7174
pnpm run convert-to-js "JSDemos/Demos/Diagram/**/React"
7275
```
7376
74-
1. To ensure that React JavaScript and TypeScript sources are always in sync, the following GitHub action is used: "Check generated JS demos".
75-
76-
77+
The "Check generated JS demos" GitHub Action ensures that the React JavaScript and TypeScript sources remain in sync.
7778
## See Also
7879
7980
- [Technical demos online](https://js.devexpress.com/Demos/)

apps/demos/project.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,25 @@
102102
"{projectRoot}/**/*"
103103
],
104104
"cache": true
105+
},
106+
"prepare-js": {
107+
"executor": "nx:run-script",
108+
"options": {
109+
"script": "prepare-js"
110+
},
111+
"dependsOn": [
112+
{ "projects": ["devextreme"], "target": "build" },
113+
{ "projects": ["devextreme-angular", "devextreme-react", "devextreme-vue"], "target": "pack" }
114+
],
115+
"inputs": [
116+
"default",
117+
"{projectRoot}/gulpfile.js/**/*",
118+
"{projectRoot}/rollup.devextreme-angular.umd.config.mjs"
119+
],
120+
"outputs": [
121+
"{projectRoot}/Demos/**/config.js"
122+
],
123+
"cache": true
105124
}
106125
},
107126
"namedInputs": {

0 commit comments

Comments
 (0)