Skip to content

Commit e0533df

Browse files
Merge branch '25_1' of https://github.com/DevExpress/DevExtreme into 25_1_demos_csb_tgz
2 parents 790278a + 819861a commit e0533df

463 files changed

Lines changed: 10110 additions & 6465 deletions

File tree

Some content is hidden

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

.github/renovate.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,15 @@
1515
"packageRules": [
1616
{
1717
"matchPackageNames": [
18-
"openai"
18+
"openai",
19+
"rehype-minify-whitespace",
20+
"rehype-parse",
21+
"rehype-remark",
22+
"rehype-stringify",
23+
"remark-parse",
24+
"remark-rehype",
25+
"remark-stringify",
26+
"unified"
1927
],
2028
"enabled": false
2129
},

.github/workflows/qunit_tests-additional-renovation.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ jobs:
6161
working-directory: ./packages/devextreme
6262
run: |
6363
node ../../tools/scripts/performance_log.js &
64-
pnpx nx build:dev
65-
pnpx nx build:systemjs
64+
pnpm nx build:systemjs
6665
6766
- name: Zip artifacts
6867
working-directory: ./packages/devextreme

.github/workflows/wrapper_tests.yml

Lines changed: 80 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: DevExtreme Wrappers Tests
1+
name: Wrappers Tests
22

33
on:
44
pull_request:
@@ -13,19 +13,14 @@ env:
1313
BUILD_TEST_INTERNAL_PACKAGE: true
1414

1515
jobs:
16-
test:
16+
build:
1717
runs-on: devextreme-shr2
18-
timeout-minutes: 80
18+
timeout-minutes: 15
1919

2020
steps:
2121
- name: Get sources
2222
uses: actions/checkout@v4
2323

24-
- name: Setup Chrome
25-
uses: ./.github/actions/setup-chrome
26-
with:
27-
chrome-version: '133.0.6943.53'
28-
2924
- name: Use Node.js
3025
uses: actions/setup-node@v4
3126
with:
@@ -60,6 +55,42 @@ jobs:
6055
working-directory: ./packages/devextreme
6156
run: pnpx nx build
6257

58+
check-regenerate:
59+
runs-on: devextreme-shr2
60+
timeout-minutes: 10
61+
62+
steps:
63+
- name: Get sources
64+
uses: actions/checkout@v4
65+
66+
- name: Use Node.js
67+
uses: actions/setup-node@v4
68+
with:
69+
node-version: '20'
70+
71+
- uses: pnpm/action-setup@v3
72+
with:
73+
version: 9
74+
run_install: false
75+
76+
- name: Get pnpm store directory
77+
shell: bash
78+
run: |
79+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
80+
81+
- uses: actions/cache@v4
82+
name: Setup pnpm cache
83+
with:
84+
path: |
85+
${{ env.STORE_PATH }}
86+
.nx/cache
87+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
88+
restore-keys: |
89+
${{ runner.os }}-pnpm-store
90+
91+
- name: Install dependencies
92+
run: pnpm install
93+
6394
- name: Generate wrappers
6495
run: pnpm run regenerate-all
6596

@@ -75,33 +106,52 @@ jobs:
75106
exit 1
76107
fi
77108
78-
- name: Angular - Download Browser
79-
run: pnpx puppeteer browsers install chrome@130.0.6723.69
109+
test:
110+
runs-on: devextreme-shr2
111+
timeout-minutes: 20
112+
needs: build
113+
strategy:
114+
fail-fast: false
115+
matrix:
116+
framework: [angular, react, vue]
80117

81-
- name: Angular - Build
82-
run: pnpx nx build devextreme-angular
118+
steps:
119+
- name: Get sources
120+
uses: actions/checkout@v4
83121

84-
- name: Angular - Run tests
85-
run: pnpx nx test:dev devextreme-angular
122+
- name: Use Node.js
123+
uses: actions/setup-node@v4
124+
with:
125+
node-version: '20'
86126

87-
- name: Angular - Check packing
88-
run: pnpx nx pack devextreme-angular
127+
- uses: pnpm/action-setup@v3
128+
with:
129+
version: 9
130+
run_install: false
89131

90-
- name: React - Run tests
91-
run: pnpm exec nx test devextreme-react
132+
- name: Get pnpm store directory
133+
shell: bash
134+
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
135+
136+
- uses: actions/cache@v4
137+
name: Setup pnpm cache
138+
with:
139+
path: |
140+
${{ env.STORE_PATH }}
141+
.nx/cache
142+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
143+
restore-keys: |
144+
${{ runner.os }}-pnpm-store
92145
93-
- name: React - Check packing
94-
run: pnpm exec nx pack devextreme-react
146+
- name: Install dependencies
147+
run: pnpm install
95148

96-
- name: Vue - Run tests
97-
run: pnpx nx test devextreme-vue
149+
- name: Download Browser
150+
if: matrix.framework == 'angular'
151+
run: pnpx puppeteer browsers install chrome@130.0.6723.69
98152

99-
- name: Vue - Check packing
100-
run: pnpx nx pack devextreme-vue
153+
- name: Test ${{ matrix.framework }}
154+
run: pnpx nx test devextreme-${{ matrix.framework }}
101155

102-
- name: Archive devextreme-metadata artifacts
103-
uses: actions/upload-artifact@v4
104-
with:
105-
name: devextreme-metadata-artifacts
106-
path: packages/devextreme-metadata/dist/
107-
retention-days: 7
156+
- name: Pack ${{ matrix.framework }}
157+
run: pnpx nx pack devextreme-${{ matrix.framework }}

apps/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devextreme-angular-playground",
33
"description": "DevExtreme Angular UI and Visualization Components",
44
"private": true,
5-
"version": "25.1.3",
5+
"version": "25.1.4",
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule, Component, enableProdMode } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
4-
import { Workbook } from 'exceljs';
4+
import { Workbook } from 'devextreme-exceljs-fork';
55
import { saveAs } from 'file-saver-es';
66
// Our demo infrastructure requires us to use 'file-saver-es'. We recommend that you use the official 'file-saver' package in your applications.
77
import { exportDataGrid } from 'devextreme-angular/common/export/excel';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import DataGrid, {
33
Column, Export, Summary, GroupPanel, Grouping, SortByGroupSummaryInfo, TotalItem, type DataGridTypes,
44
} from 'devextreme-react/data-grid';
5-
import { Workbook } from 'exceljs';
5+
import { Workbook } from 'devextreme-exceljs-fork';
66
import { saveAs } from 'file-saver-es';
77
import { exportDataGrid } from 'devextreme-react/common/export/excel';
88
import { companies } from './data.ts';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import DataGrid, {
88
SortByGroupSummaryInfo,
99
TotalItem,
1010
} from 'devextreme-react/data-grid';
11-
import { Workbook } from 'exceljs';
11+
import { Workbook } from 'devextreme-exceljs-fork';
1212
import { saveAs } from 'file-saver-es';
1313
import { exportDataGrid } from 'devextreme-react/common/export/excel';
1414
import { companies } from './data.js';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import {
7070
DxTotalItem,
7171
type DxDataGridTypes,
7272
} from 'devextreme-vue/data-grid';
73-
import { Workbook } from 'exceljs';
73+
import { Workbook } from 'devextreme-exceljs-fork';
7474
// Our demo infrastructure requires us to use 'file-saver-es'.
7575
// We recommend that you use the official 'file-saver' package in your applications.
7676
import { saveAs } from 'file-saver-es';

apps/demos/Demos/DataGrid/ExcelJSCellCustomization/description.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ The [customizeCell](/Documentation/ApiReference/Common/Object_Structures/ExportD
22

33
You can access and change the following attributes:
44

5-
- <a href="https://github.com/exceljs/exceljs#fonts" target="_blank">Font</a> properties
6-
- <a href="https://github.com/exceljs/exceljs#fills" target="_blank">Cell background</a>
7-
- <a href="https://github.com/exceljs/exceljs#hyperlink-value" target="_blank">Cell values</a>
8-
- Text <a href="https://github.com/exceljs/exceljs#alignment" target="_blank">alignment</a>
9-
- <a href="https://github.com/exceljs/exceljs#number-formats" target="_blank">Formatting</a> properties
5+
- <a href="https://github.com/DevExpress/devextreme-exceljs-fork#fonts" target="_blank">Font</a> properties
6+
- <a href="https://github.com/DevExpress/devextreme-exceljs-fork#fills" target="_blank">Cell background</a>
7+
- <a href="https://github.com/DevExpress/devextreme-exceljs-fork#hyperlink-value" target="_blank">Cell values</a>
8+
- Text <a href="https://github.com/DevExpress/devextreme-exceljs-fork#alignment" target="_blank">alignment</a>
9+
- <a href="https://github.com/DevExpress/devextreme-exceljs-fork#number-formats" target="_blank">Formatting</a> properties
1010

1111
The [customizeCell](/Documentation/ApiReference/Common/Object_Structures/ExportDataGridProps/#customizeCell) function also allows you to identify row types. For example, this demo changes the background color and font weight for cells with the "group" [rowType](/Documentation/ApiReference/UI_Components/dxDataGrid/Row/#rowType).
1212
<!--split-->

apps/demos/Demos/DataGrid/ExcelJSCellCustomization/jQuery/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
></script>
1515
<script
1616
type="text/javascript"
17-
src="https://cdnjs.cloudflare.com/ajax/libs/exceljs/4.4.0/exceljs.min.js"
18-
integrity="sha384-Pqp51FUN2/qzfxZxBCtF0stpc9ONI6MYZpVqmo8m20SoaQCzf+arZvACkLkirlPz"
17+
src="https://cdn.jsdelivr.net/npm/devextreme-exceljs-fork@4.4.2/dist/dx-exceljs-fork.min.js"
18+
integrity="sha384-0+mgPqjdXmZE1Htq8mACKhUtATn8hf01dRM9aFav8bXXD1ioy+B6TIu9lieIrTcM"
1919
crossorigin="anonymous"
2020
></script>
2121
<script

0 commit comments

Comments
 (0)