Skip to content

Commit 794629c

Browse files
Merge branch 'dev' of https://github.com/DevExpress/devextreme-cli into dev_nextjs
# Conflicts: # packages/devextreme-cli/src/utility/latest-versions.js # packages/devextreme-schematics/src/add-app-template/schema.json # packages/devextreme-schematics/src/install/schema.json # packages/devextreme-schematics/src/utility/latest-versions.ts
2 parents 1b38e95 + 3a95283 commit 794629c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

packages/devextreme-cli/src/utility/latest-versions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const packageJson = require('../../package.json');
22
module.exports = {
3-
'devextreme': '25.1-next',
4-
'devextreme-react': '25.1-next',
5-
'devextreme-vue': '25.1-next',
3+
'devextreme': '25.1.1-alpha',
4+
'devextreme-react': '25.1.1-alpha',
5+
'devextreme-vue': '25.1.1-alpha',
66
'create-vite': '6.3.1',
77
'create-next-app': '15.2.5',
88
'devextreme-cli': packageJson.version,

packages/devextreme-schematics/src/add-app-template/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"dxversion": {
4040
"type": "string",
4141
"description": "The DevExtreme version",
42-
"default": "25.1-next"
42+
"default": "25.1.1-alpha"
4343
},
4444
"globalNgCliVersion": {
4545
"type":"string",

packages/devextreme-schematics/src/install/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dxversion": {
88
"type": "string",
99
"description": "The DevExtreme version",
10-
"default": "25.1-next"
10+
"default": "25.1.1-alpha"
1111
},
1212
"project": {
1313
"type": "string",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// TODO: implement
22
export const latestVersions = {
3-
'devextreme': '25.1-next',
4-
'devextreme-angular': '25.1-next',
3+
'devextreme': '25.1.1-alpha',
4+
'devextreme-angular': '25.1.1-alpha',
55
'devextreme-cli': 'latest'
66
};

0 commit comments

Comments
 (0)