Skip to content

Commit ede33a6

Browse files
authored
Update CLI to use version 24.1 (#893)
1 parent 3469829 commit ede33a6

File tree

10 files changed

+35
-18
lines changed

10 files changed

+35
-18
lines changed

packages/devextreme-cli/src/applications/application.angular.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ async function runNgCommand(commandArguments, commandOptions, commandConfig) {
4040
const hasNg = await hasSutableNgCli();
4141
const toolingVersion = extractToolingVersion(commandOptions);
4242
const npmCommandName = hasNg && !toolingVersion ? 'ng' : 'npx';
43+
const [minCliLtsVersion] = minNgCliVersion.version.split('.');
4344
const ngCommandArguments = hasNg && !toolingVersion
4445
? []
45-
: ['-p', '@angular/cli@v15-lts', 'ng'];
46+
: ['-p', `@angular/cli@v${minCliLtsVersion}-lts`, 'ng'];
4647

4748
ngCommandArguments.push(...commandArguments);
4849
return runCommand(npmCommandName, ngCommandArguments, commandConfig);

packages/devextreme-cli/src/templates/react/application/src/components/side-navigation-menu/SideNavigationMenu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useEffect, useRef, useCallback, useMemo } from 'react';
2-
import TreeView from 'devextreme-react/tree-view';
2+
import { TreeView<%=#isTypeScript%>, TreeViewRef<%=/isTypeScript%> } from 'devextreme-react/tree-view';
33
import { navigation } from '../../app-navigation';
44
import { useNavigation } from '../../contexts/navigation';
55
import { useScreenSize } from '../../utils/media-query';
@@ -32,7 +32,7 @@ export default function SideNavigationMenu(props<%=#isTypeScript%>: React.PropsW
3232

3333
const { navigationData: { currentPath } } = useNavigation();
3434

35-
const treeViewRef = useRef<%=#isTypeScript%><TreeView><%=/isTypeScript%>(null);
35+
const treeViewRef = useRef<%=#isTypeScript%><TreeViewRef><%=/isTypeScript%>(null);
3636
const wrapperRef = useRef<%=#isTypeScript%><HTMLDivElement><%=/isTypeScript%>();
3737
const getWrapperRef = useCallback((element<%=#isTypeScript%>: HTMLDivElement<%=/isTypeScript%>) => {
3838
const prevElement = wrapperRef.current;
@@ -47,7 +47,7 @@ export default function SideNavigationMenu(props<%=#isTypeScript%>: React.PropsW
4747
}, [openMenu]);
4848

4949
useEffect(() => {
50-
const treeView = treeViewRef.current && treeViewRef.current.instance;
50+
const treeView = treeViewRef.current && treeViewRef.current.instance();
5151
if (!treeView) {
5252
return;
5353
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import './polyfills';
2+
import React from 'react';
3+
import ReactDOM from 'react-dom/client';
4+
import './index.css';
5+
import App from './App';
6+
import reportWebVitals from './reportWebVitals';
7+
8+
const root = ReactDOM.createRoot(
9+
document.getElementById('root')<%=#isTypeScript%> as HTMLElement<%=/isTypeScript%>
10+
);
11+
root.render(<App />);
12+
13+
// If you want to start measuring performance in your app, pass a function
14+
// to log results (for example: reportWebVitals(console.log))
15+
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
16+
reportWebVitals();

packages/devextreme-cli/src/templates/react/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Button from 'devextreme-react/button';
22
import Drawer from 'devextreme-react/drawer';
3-
import ScrollView from 'devextreme-react/scroll-view';
3+
import { ScrollView<%=#isTypeScript%>, ScrollViewRef<%=/isTypeScript%> } from 'devextreme-react/scroll-view';
44
import Toolbar, { Item } from 'devextreme-react/toolbar';
55
import React, { useState, useCallback, useRef } from 'react';
66
import { useNavigate } from 'react-router';
@@ -14,7 +14,7 @@ import { useMenuPatch } from '../../utils/patches';
1414
<%=#isTypeScript%>import { ButtonTypes } from 'devextreme-react/button';<%=/isTypeScript%>
1515

1616
export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%>: React.PropsWithChildren<SideNavToolbarProps><%=/isTypeScript%>) {
17-
const scrollViewRef = useRef<%=#isTypeScript%><ScrollView><%=/isTypeScript%>(null);
17+
const scrollViewRef = useRef<%=#isTypeScript%><ScrollViewRef><%=/isTypeScript%>(null);
1818
const navigate = useNavigate();
1919
const { isXSmall, isLarge } = useScreenSize();
2020
const [patchCssClass, onMenuReady] = useMenuPatch();
@@ -55,7 +55,7 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
5555
}
5656

5757
navigate(itemData.path);
58-
scrollViewRef.current<%=#isTypeScript%>?<%=/isTypeScript%>.instance.scrollTo(0);
58+
scrollViewRef.current<%=#isTypeScript%>?<%=/isTypeScript%>.instance().scrollTo(0);
5959

6060
if (!isLarge || menuStatus === MenuStatus.TemporaryOpened) {
6161
setMenuStatus(MenuStatus.Closed);

packages/devextreme-cli/src/templates/react/application/src/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Drawer from 'devextreme-react/drawer';
2-
import ScrollView from 'devextreme-react/scroll-view';
2+
import { ScrollView<%=#isTypeScript%>, ScrollViewRef<%=/isTypeScript%> } from 'devextreme-react/scroll-view';
33
import React, { useState, useCallback, useRef } from 'react';
44
import { useNavigate } from 'react-router';
55
import { Header, SideNavigationMenu, Footer } from '../../components';
@@ -12,7 +12,7 @@ import { useMenuPatch } from '../../utils/patches';
1212
<%=#isTypeScript%>import type { SideNavToolbarProps } from '../../types';<%=/isTypeScript%>
1313

1414
export default function SideNavOuterToolbar({ title, children }<%=#isTypeScript%>: React.PropsWithChildren<SideNavToolbarProps><%=/isTypeScript%>) {
15-
const scrollViewRef = useRef<%=#isTypeScript%><ScrollView><%=/isTypeScript%>(null);
15+
const scrollViewRef = useRef<%=#isTypeScript%><ScrollViewRef><%=/isTypeScript%>(null);
1616
const navigate = useNavigate();
1717
const { isXSmall, isLarge } = useScreenSize();
1818
const [patchCssClass, onMenuReady] = useMenuPatch();
@@ -53,7 +53,7 @@ export default function SideNavOuterToolbar({ title, children }<%=#isTypeScript%
5353
}
5454

5555
navigate(itemData.path);
56-
scrollViewRef.current<%=#isTypeScript%>?<%=/isTypeScript%>.instance.scrollTo(0);
56+
scrollViewRef.current<%=#isTypeScript%>?<%=/isTypeScript%>.instance().scrollTo(0);
5757

5858
if (!isLarge || menuStatus === MenuStatus.TemporaryOpened) {
5959
setMenuStatus(MenuStatus.Closed);
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': '23.2.6',
4-
'devextreme-react': '23.2.6',
5-
'devextreme-vue': '23.2.6',
3+
'devextreme': '24.1.3',
4+
'devextreme-react': '24.1.3',
5+
'devextreme-vue': '24.1.3',
66
'devextreme-cli': packageJson.version,
77
'devextreme-schematics': 'latest'
88
};

packages/devextreme-cli/src/utility/ng-version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const getLocalNgVersion = () => {
1515
};
1616

1717
const getPublicNgVersion = () => {
18-
const version = execSync('npm view @angular/cli@v15-lts version').toString();
18+
const version = execSync('npm view @angular/cli@v16-lts version').toString();
1919
return new semver(version);
2020
};
2121

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": "23.2.6"
42+
"default": "24.1.3"
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": "23.2.6"
10+
"default": "24.1.3"
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': '23.2.6',
4-
'devextreme-angular': '23.2.6',
3+
'devextreme': '24.1.3',
4+
'devextreme-angular': '24.1.3',
55
'devextreme-cli': 'latest'
66
};

0 commit comments

Comments
 (0)