devextreme-cli 1.2.23 → 1.3.0

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) Developer Express Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) Developer Express Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.2.23",
+  "version": "1.3.0",
   "description": "DevExtreme CLI",
   "keywords": [
     "devexpress",
@@ -69,5 +69,5 @@
     "tree-kill-promise": "^1.0.3",
     "typescript": "^4.0.2"
   },
-  "gitHead": "777e8d2b209c52381f604bb395a5289c8cded7da"
+  "gitHead": "c61a31f44439fe1b0e82449a15c4db8375af34f3"
 }

package/src/applications/application.angular.js

@@ -32,7 +32,7 @@ async function runSchematicCommand(schematicCommand, options, evaluatingOptions)
 }
 
 async function runNgCommand(commandArguments, evaluatingOptions) {
-    const ngCommandArguments = await hasSutableNgCli() ? [] : ['-p', '@angular/cli@12'];
+    const ngCommandArguments = await hasSutableNgCli() ? [] : ['-p', '@angular/cli'];
 
     ngCommandArguments.push('ng', ...commandArguments);
     return runCommand('npx', ngCommandArguments, evaluatingOptions);

package/src/applications/application.react.js

@@ -42,7 +42,7 @@ const updateJsonPropName = (path, name) => {
 };
 
 const create = (appName, options) => {
-    const commandArguments = ['create-react-app', appName];
+    const commandArguments = ['-p=create-react-app', 'create-react-app', appName];
 
     getLayoutInfo(options.layout).then((layoutInfo) => {
         runCommand('npx', commandArguments).then(() => {

package/src/applications/application.vue.js

@@ -91,6 +91,12 @@ const modifyIndexHtml = (appPath, appName) => {
     fs.writeFileSync(indexHtmlPath, htmlContent);
 };
 
+const getMainModulePath = (appPath) => {
+    const jsModule = path.join(appPath, 'src', 'main.js');
+
+    return fs.existsSync(jsModule) ? jsModule : path.join(appPath, 'src', 'main.ts');
+};
+
 const addTemplate = (appPath, appName, templateOptions, version) => {
     if(!version) {
         version = getVueVersion();
@@ -113,16 +119,17 @@ const addTemplate = (appPath, appName, templateOptions, version) => {
 
 const install = (options, appPath, styles) => {
     appPath = appPath ? appPath : process.cwd();
-    const mainModulePath = path.join(appPath, 'src', 'main.js');
-    addStylesToApp(mainModulePath, styles || defaultStyles);
+    addStylesToApp(appPath, styles || defaultStyles);
     packageJsonUtils.addDevextreme(appPath, options.dxversion, 'vue');
 
     packageManager.runInstall({ cwd: appPath });
 };
 
-const addStylesToApp = (filePath, styles) => {
+const addStylesToApp = (appPath, styles) => {
+    const mainModulePath = getMainModulePath(appPath);
+
     styles.forEach(style => {
-        moduleUtils.insertImport(filePath, style);
+        moduleUtils.insertImport(mainModulePath, style);
     });
 };
 

package/src/templates/react/application/src/dx-styles.scss

@@ -7,6 +7,10 @@
   width: 100%;
 }
 
+.side-nav-outer-toolbar .dx-drawer {
+  height: calc(100% - 56px)
+}
+
 .app .content {
   line-height: 1.5;
 

package/src/templates/vue-v2/application/src/dx-styles.scss

@@ -8,6 +8,10 @@
   }
 }
 
+.side-nav-outer-toolbar .dx-drawer {
+  height: calc(100% - 56px)
+}
+
 .content-block {
   margin-left: 40px;
   margin-right: 40px;

package/src/templates/vue-v3/application/src/dx-styles.scss

@@ -8,6 +8,10 @@
   }
 }
 
+.side-nav-outer-toolbar .dx-drawer {
+  height: calc(100% - 56px)
+}
+
 .content-block {
   margin-left: 40px;
   margin-right: 40px;