devextreme-cli 1.6.1 → 1.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +14 -14
- package/src/applications/application.angular.js +7 -1
- package/src/templates/react/application/src/components/user-panel/UserPanel.tsx +4 -4
- package/src/templates/react/application/src/contexts/navigation.tsx +1 -1
- package/src/templates/react/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.tsx +1 -1
- package/src/templates/react/application/src/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.tsx +1 -1
- package/src/templates/react/application/src/utils/default-user.tsx +3 -1
- package/src/utility/latest-versions.js +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "devextreme-cli",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.3",
|
|
4
4
|
"description": "DevExtreme CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"devexpress",
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
41
41
|
"import-cwd": "^3.0.0",
|
|
42
|
-
"ip": "^1.1.
|
|
42
|
+
"ip": "^1.1.8",
|
|
43
43
|
"less": "3.13.1",
|
|
44
|
-
"minimist": "^1.2.
|
|
45
|
-
"mustache": "^3.
|
|
46
|
-
"prompts": "^2.
|
|
47
|
-
"sass": "^1.
|
|
48
|
-
"semver": "^5.
|
|
44
|
+
"minimist": "^1.2.8",
|
|
45
|
+
"mustache": "^3.2.1",
|
|
46
|
+
"prompts": "^2.4.2",
|
|
47
|
+
"sass": "^1.69.5",
|
|
48
|
+
"semver": "^5.7.2",
|
|
49
49
|
"strip-bom": "^4.0.0"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
@@ -55,23 +55,23 @@
|
|
|
55
55
|
"cross-env": "^5.2.1",
|
|
56
56
|
"eslint": "^7.32.0",
|
|
57
57
|
"eslint-config-angular": "^0.5.0",
|
|
58
|
-
"eslint-config-prettier": "^8.
|
|
58
|
+
"eslint-config-prettier": "^8.10.0",
|
|
59
59
|
"eslint-plugin-angular": "^4.1.0",
|
|
60
60
|
"eslint-plugin-jest": "^22.21.0",
|
|
61
|
-
"eslint-plugin-prettier": "^4.
|
|
62
|
-
"eslint-plugin-react": "^7.
|
|
61
|
+
"eslint-plugin-prettier": "^4.2.1",
|
|
62
|
+
"eslint-plugin-react": "^7.33.2",
|
|
63
63
|
"eslint-plugin-react-hooks": "^4.6.0",
|
|
64
64
|
"eslint-plugin-unused-imports": "^1.1.5",
|
|
65
65
|
"eslint-plugin-vue": "^7.20.0",
|
|
66
66
|
"eslint-stylish": "^0.2.0",
|
|
67
|
-
"jest": "^29.
|
|
68
|
-
"jest-image-snapshot": "^6.
|
|
69
|
-
"prettier": "^2.
|
|
67
|
+
"jest": "^29.7.0",
|
|
68
|
+
"jest-image-snapshot": "^6.2.0",
|
|
69
|
+
"prettier": "^2.8.8",
|
|
70
70
|
"rimraf": "^2.7.1",
|
|
71
71
|
"tree-kill": "^1.2.2",
|
|
72
72
|
"tree-kill-promise": "^1.0.12",
|
|
73
73
|
"typescript": "^4.0.2",
|
|
74
74
|
"typescript-eslint-parser": "^22.0.0"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "e63572aa95b871bae22f4d3799762bdcc8147cc0"
|
|
77
77
|
}
|
|
@@ -11,6 +11,7 @@ const { extractToolingVersion, toolingVersionOptionName } = require('../utility/
|
|
|
11
11
|
const schematicsVersion = latestVersions['devextreme-schematics'] || 'latest';
|
|
12
12
|
|
|
13
13
|
const minNgCliVersion = new semver('12.0.0');
|
|
14
|
+
const ngCliWithStandalone = new semver('17.0.0');
|
|
14
15
|
|
|
15
16
|
async function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
|
|
16
17
|
const collectionName = 'devextreme-schematics';
|
|
@@ -75,6 +76,7 @@ const install = async(options) => {
|
|
|
75
76
|
|
|
76
77
|
const create = async(appName, options) => {
|
|
77
78
|
const layout = await getLayoutInfo(options.layout);
|
|
79
|
+
const currentNgVersion = ngVersion.getNgCliVersion().version;
|
|
78
80
|
|
|
79
81
|
const commandArguments = [
|
|
80
82
|
'new',
|
|
@@ -82,9 +84,13 @@ const create = async(appName, options) => {
|
|
|
82
84
|
'--style=scss',
|
|
83
85
|
'--routing=false',
|
|
84
86
|
'--skip-tests=true',
|
|
85
|
-
'--skip-install=true'
|
|
87
|
+
'--skip-install=true'
|
|
86
88
|
];
|
|
87
89
|
|
|
90
|
+
if(ngCliWithStandalone.compare(currentNgVersion) <= 0) {
|
|
91
|
+
commandArguments.push('--standalone=false');
|
|
92
|
+
}
|
|
93
|
+
|
|
88
94
|
await runNgCommand(commandArguments, options);
|
|
89
95
|
|
|
90
96
|
const appPath = path.join(process.cwd(), appName);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useMemo } from 'react';
|
|
1
|
+
import React, { useMemo, useCallback } from 'react';
|
|
2
2
|
import { useNavigate } from "react-router-dom";
|
|
3
3
|
import ContextMenu, { Position } from 'devextreme-react/context-menu';
|
|
4
4
|
import List from 'devextreme-react/list';
|
|
@@ -10,9 +10,9 @@ export default function UserPanel({ menuMode }<%=#isTypeScript%>: UserPanelProps
|
|
|
10
10
|
const { user, signOut } = useAuth();
|
|
11
11
|
const navigate = useNavigate();
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
const navigateToProfile = useCallback(() => {
|
|
14
14
|
navigate("/profile");
|
|
15
|
-
}
|
|
15
|
+
}, [navigate]);
|
|
16
16
|
const menuItems = useMemo(() => ([
|
|
17
17
|
{
|
|
18
18
|
text: 'Profile',
|
|
@@ -24,7 +24,7 @@ export default function UserPanel({ menuMode }<%=#isTypeScript%>: UserPanelProps
|
|
|
24
24
|
icon: 'runner',
|
|
25
25
|
onClick: signOut
|
|
26
26
|
}
|
|
27
|
-
]), [signOut]);
|
|
27
|
+
]), [navigateToProfile, signOut]);
|
|
28
28
|
return (
|
|
29
29
|
<div className={'user-panel'}>
|
|
30
30
|
<div className={'user-info'}>
|
|
@@ -21,7 +21,7 @@ function withNavigationWatcher(Component<%=#isTypeScript%>: React.ElementType<%=
|
|
|
21
21
|
|
|
22
22
|
useEffect(() => {
|
|
23
23
|
setNavigationData<%=#isTypeScript%>!<%=/isTypeScript%>({ currentPath: path });
|
|
24
|
-
}, [
|
|
24
|
+
}, [setNavigationData]);
|
|
25
25
|
|
|
26
26
|
return <Component {...props} />;
|
|
27
27
|
}
|
|
@@ -46,7 +46,7 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
|
|
|
46
46
|
: prevMenuStatus
|
|
47
47
|
);
|
|
48
48
|
return menuStatus === MenuStatus.Closed ? true : false;
|
|
49
|
-
}, [isLarge]);
|
|
49
|
+
}, [isLarge, menuStatus]);
|
|
50
50
|
|
|
51
51
|
const onNavigationChanged = useCallback(({ itemData, event, node }<%=#isTypeScript%>: TreeViewTypes.ItemClickEvent<%=/isTypeScript%>) => {
|
|
52
52
|
if (menuStatus === MenuStatus.Closed || !itemData<%=#isTypeScript%>?<%=/isTypeScript%>.path || node<%=#isTypeScript%>?<%=/isTypeScript%>.selected) {
|
|
@@ -44,7 +44,7 @@ export default function SideNavOuterToolbar({ title, children }<%=#isTypeScript%
|
|
|
44
44
|
: prevMenuStatus
|
|
45
45
|
);
|
|
46
46
|
return menuStatus === MenuStatus.Closed ? true : false;
|
|
47
|
-
}, [isLarge]);
|
|
47
|
+
}, [isLarge, menuStatus]);
|
|
48
48
|
|
|
49
49
|
const onNavigationChanged = useCallback(({ itemData, event, node }<%=#isTypeScript%>: TreeViewTypes.ItemClickEvent<%=/isTypeScript%>) => {
|
|
50
50
|
if (menuStatus === MenuStatus.Closed || !itemData<%=#isTypeScript%>?<%=/isTypeScript%>.path || node<%=#isTypeScript%>?<%=/isTypeScript%>.selected) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const packageJson = require('../../package.json');
|
|
2
2
|
module.exports = {
|
|
3
|
-
'devextreme': '^23.1.
|
|
4
|
-
'devextreme-react': '^23.1.
|
|
5
|
-
'devextreme-vue': '^23.1.
|
|
3
|
+
'devextreme': '^23.1.6',
|
|
4
|
+
'devextreme-react': '^23.1.6',
|
|
5
|
+
'devextreme-vue': '^23.1.6',
|
|
6
6
|
'devextreme-cli': packageJson.version,
|
|
7
7
|
'devextreme-schematics': 'latest'
|
|
8
8
|
};
|