Skip to content

Commit ba02cf3

Browse files
authored
Merge branch '26_1' into appointment-overlappint-demo
2 parents b4d9f7b + dff60b5 commit ba02cf3

20 files changed

Lines changed: 3070 additions & 2828 deletions

File tree

.vscode/settings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"watch": true,
44
},
55
"editor.codeActionsOnSave": {
6-
"source.fixAll.eslint": "explicit"
6+
"source.fixAll.eslint": "explicit",
7+
"source.fixAll.stylelint": "explicit"
78
},
8-
"typescript.tsdk": "packages/devextreme/node_modules/typescript/lib"
9+
"typescript.tsdk": "packages/devextreme/node_modules/typescript/lib",
10+
"stylelint.validate": ["css", "scss"]
911
}

apps/demos/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"npm-run-all2": "5.0.2",
144144
"open": "8.4.2",
145145
"prettier": "2.8.8",
146-
"rollup": "4.22.4",
146+
"rollup": "4.59.0",
147147
"serve-index": "1.9.2",
148148
"serve-static": "1.16.3",
149149
"stylelint": "16.22.0",

apps/react-storybook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"prop-types": "15.8.1",
3030
"react": "18.3.1",
3131
"react-dom": "18.3.1",
32-
"storybook": "10.1.10",
32+
"storybook": "10.2.10",
3333
"typescript": "5.9.3"
3434
}
3535
}

e2e/bundlers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"minimist": "1.2.8",
1515
"parcel": "2.16.3",
1616
"rimraf": "3.0.2",
17-
"rollup": "4.22.4",
17+
"rollup": "4.59.0",
1818
"vite": "5.4.21",
1919
"webpack": "5.105.0",
2020
"webpack-cli": "4.10.0",

0 commit comments

Comments
 (0)