Skip to content

Commit ea3cbb4

Browse files
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into 25_2_update_angular19
# Conflicts: # pnpm-lock.yaml
2 parents b3a8ae1 + a538a92 commit ea3cbb4

File tree

4 files changed

+3565
-1809
lines changed

4 files changed

+3565
-1809
lines changed

e2e/bundlers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"parcel": "2.16.1",
1616
"rimraf": "3.0.2",
1717
"rollup": "4.22.4",
18-
"vite": "5.4.19",
18+
"vite": "5.4.21",
1919
"webpack": "5.94.0",
2020
"webpack-cli": "4.10.0",
2121
"devextreme": "workspace:*",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"braces@<3.0.3": "^3.0.3",
7474
"semver@<5.7.2": "^5.7.2",
7575
"glob@>=10.2.0 <10.5.0": "^10.5.0",
76-
"node-forge@<1.3.2": "^1.3.2"
76+
"node-forge@<1.3.2": "^1.3.2",
77+
"vite@>=6.0.0 <6.4.1": "^6.4.1"
7778
}
7879
},
7980
"packageManager": "[email protected]"

packages/devextreme-angular/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
},
107107
"update-node-modules-with-npm-dist": {
108108
"executor": "devextreme-nx-infra-plugin:copy-files",
109-
"dependsOn": ["npm:pack-npm-dist"],
110109
"options": {
111110
"files": [
112111
{

0 commit comments

Comments
 (0)