Skip to content

Commit a76c654

Browse files
Merge branch '26_1' into license/fix-texts
2 parents 9bce7dc + 52aeb52 commit a76c654

77 files changed

Lines changed: 1434 additions & 1196 deletions

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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
"gulp-jsbeautifier",
142142
"gulp-multi-process",
143143
"gulp-notify",
144-
"gulp-remote-src",
145144
"gulp-rename",
146145
"gulp-tap",
147146
"gulp-uglify-es",

.github/workflows/health-check.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ jobs:
1010
invoke:
1111
name: Invoke
1212
uses: DevExpress/github-actions/.github/workflows/repository-check.yml@repository-check
13+
with:
14+
config: |
15+
{
16+
ignoredAdvisories: [
17+
'GHSA-67hx-6x53-jw92', // babel-traverse
18+
]
19+
}

.github/workflows/packages_publishing.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,6 @@ jobs:
4242
with:
4343
run_install: false
4444

45-
- name: Get pnpm store directory
46-
shell: bash
47-
run: |
48-
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
49-
50-
- uses: actions/cache@v4
51-
name: Setup pnpm cache
52-
with:
53-
path: ${{ env.PNPM_STORE_PATH }}
54-
key: ${{ runner.os }}-pnpm-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
55-
restore-keys: |
56-
${{ runner.os }}-pnpm-cache
57-
5845
- name: Install dependencies
5946
run: pnpm install --frozen-lockfile
6047

@@ -140,19 +127,6 @@ jobs:
140127
with:
141128
run_install: false
142129

143-
- name: Get pnpm store directory
144-
shell: bash
145-
run: |
146-
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
147-
148-
- uses: actions/cache@v4
149-
name: Setup pnpm cache
150-
with:
151-
path: ${{ env.PNPM_STORE_PATH }}
152-
key: ${{ runner.os }}-pnpm-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
153-
restore-keys: |
154-
${{ runner.os }}-pnpm-cache
155-
156130
- name: Install dependencies
157131
run: pnpm install --frozen-lockfile
158132

.github/workflows/packages_publishing_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1313
strategy:
1414
matrix:
15-
branch: ['24_1', '24_2', '25_1', '25_2', '26_1']
15+
branch: ['24_2', '25_1', '25_2', '26_1']
1616

1717
name: Run Packages Publishing workflow
1818
steps:

apps/demos/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"devexpress-diagram": "catalog:",
4141
"devexpress-gantt": "catalog:",
4242
"devextreme-aspnet-data": "5.0.0",
43-
"devextreme-aspnet-data-nojquery": "5.0.0",
43+
"devextreme-aspnet-data-nojquery": "5.1.0",
4444
"devextreme-cldr-data": "1.0.3",
4545
"devextreme-exceljs-fork": "catalog:",
4646
"devextreme-quill": "catalog:",

nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@
4545
"defaultBase": "master",
4646
"tui": {
4747
"enabled": false
48-
}
48+
},
49+
"analytics": false
4950
}

package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"nx": {},
3030
"private": true,
3131
"devDependencies": {
32-
"@nx/devkit": "22.4.5",
33-
"@nx/jest": "22.4.5",
34-
"@nx/js": "22.4.5",
32+
"@nx/devkit": "22.7.0",
33+
"@nx/jest": "22.7.0",
34+
"@nx/js": "22.7.0",
3535
"@types/jest": "29.5.14",
3636
"@types/node": "20.12.8",
3737
"@types/shelljs": "0.8.15",
@@ -48,7 +48,7 @@
4848
"jest": "29.7.0",
4949
"jspdf-autotable": "3.8.4",
5050
"lint-staged": "14.0.1",
51-
"nx": "22.4.5",
51+
"nx": "22.7.0",
5252
"nx-cloud": "19.1.0",
5353
"postcss": "~8.5.10",
5454
"shelljs": "0.8.5",
@@ -67,7 +67,7 @@
6767
"pnpm": {
6868
"overrides": {
6969
"@devexpress/callsite-record@^4.1.6": "4.1.7",
70-
"basic-ftp@<=5.2.2": ">=5.3.0",
70+
"basic-ftp@<5.3.1": ">=5.3.1",
7171
"@isaacs/brace-expansion@<=5.0.0": "^5.0.1",
7272
"@modelcontextprotocol/sdk@>=1.10.0 <=1.25.3": "^1.26.0",
7373
"form-data@<2.5.4": "2.5.5",
@@ -86,9 +86,10 @@
8686
"vite@>=7.0.0 <=7.3.1": "^7.3.2",
8787
"tar@<=7.5.9": "^7.5.10",
8888
"underscore@<=1.13.7": "^1.13.8",
89-
"hono@<4.12.14": ">=4.12.14",
89+
"hono@<4.12.18": ">=4.12.18",
9090
"@hono/node-server@<1.19.13": "^1.19.13",
9191
"express-rate-limit@>=8.2.0 <8.2.2": "^8.2.2",
92+
"fast-uri@<3.1.2": ">=3.1.2",
9293
"immutable@>=5.0.0 <5.1.5": "^5.1.5",
9394
"minimatch@<3.1.5": "3.1.5",
9495
"minimatch@>=9.0.0 < 9.0.7": "9.0.9",
@@ -122,7 +123,9 @@
122123
"follow-redirects@<=1.15.11": ">=1.16.0",
123124
"@angular/platform-server@>=20.0.0-next.0 <20.3.19": "^20.3.19",
124125
"stylelint-config-recommended-vue@1.6.1>stylelint-config-recommended": "^16.0.0",
125-
"uuid@<14.0.0": "~14.0.0"
126+
"uuid@<14.0.0": "~14.0.0",
127+
"postcss@<8.5.10": "8.5.10",
128+
"ip-address@<=10.1.0": ">=10.1.1"
126129
}
127130
},
128131
"packageManager": "pnpm@9.15.9"

packages/devextreme-themebuilder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dependencies": {
3131
"autoprefixer": "^10.4.21",
3232
"clean-css": "^5.3.0",
33-
"postcss": "^8.2.6",
33+
"postcss": "^8.5.10",
3434
"sass-embedded": "1.93.3"
3535
},
3636
"devDependencies": {

packages/devextreme/build/gulp/aspnet.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/devextreme/build/gulp/compression-pipes.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)