devextreme-cli 1.3.0 → 1.3.1

package/package.json

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

package/src/applications/application.react.js

@@ -21,6 +21,8 @@ const preparePackageJsonForTemplate = (appPath, appName) => {
     const dependencies = [
         { name: 'sass', version: '^1.34.1' },
         { name: 'devextreme-cli', version: latestVersions['devextreme-cli'], dev: true },
+        { name: 'react', version: '^17.0.0' },
+        { name: 'react-dom', version: '^17.0.0' },
         { name: 'react-router-dom', version: '^5.0.0' },
     ];
     const scripts = [

package/src/applications/application.vue.js

@@ -14,7 +14,7 @@ const defaultStyles = [
     'devextreme/dist/css/dx.light.css',
     'devextreme/dist/css/dx.common.css'
 ];
-const defaultVueVersion = 'v2';
+const defaultVueVersion = 'v3';
 
 const getVueVersion = () => {
     const devextremeConfig = require('../utility/devextreme-config').read();
@@ -56,14 +56,13 @@ const preparePackageJsonForTemplate = (appPath, appName, version) => {
 async function createVueApp(name, version) {
     const argList = ['-p', '@vue/cli', 'vue', 'create', name];
 
-    if(version === defaultVueVersion) {
-        argList.push('--default');
+    if(version === 'v2') {
+        argList.push('-p "Default (Vue 2)"');
     } else {
-        argList.push('-p');
-        argList.push('__default_vue_3__');
+        argList.push('-p "Default (Vue 3)"');
     }
 
-    return runCommand('npx', argList);
+    return runCommand('npx', argList, { windowsVerbatimArguments: false });
 }
 
 const create = async(appName, options) => {
@@ -155,11 +154,11 @@ const getVueRoute = (viewName, componentName, pagePath, version) => {
     const path = `path: "/${pagePath}"`;
     const name = `name: "${stringUtils.dasherize(viewName)}"`;
 
-    const metaPart = version === defaultVueVersion
+    const metaPart = version === 'v2'
         ? 'meta: { requiresAuth: true }'
         : 'meta: {\n        requiresAuth: true,\n        layout: defaultLayout\n      }';
 
-    const componentPart = version === defaultVueVersion
+    const componentPart = version === 'v2'
         ? `components:\n      {\n        layout: defaultLayout,\n        content: ${componentName}\n      }`
         : `component: ${componentName}`;
 

package/src/templates/vue-v2/application/src/router.js

@@ -3,9 +3,9 @@ import Router from "vue-router";
 
 import auth from "./auth";
 
-<%=^empty%>import Home from "./views/home";
-import Profile from "./views/profile";
-import Tasks from "./views/tasks";
+<%=^empty%>import Home from "./views/home-page";
+import Profile from "./views/profile-page";
+import Tasks from "./views/tasks-page";
 <%=/empty%>import defaultLayout from "./layouts/<%=layout%>";
 import simpleLayout from "./layouts/single-card";
 

package/src/templates/vue-v3/application/src/router.js

@@ -1,9 +1,9 @@
 import auth from "./auth";
 import { createRouter, createWebHashHistory } from "vue-router";
 
-<%=^empty%>import Home from "./views/home";
-import Profile from "./views/profile";
-import Tasks from "./views/tasks";
+<%=^empty%>import Home from "./views/home-page";
+import Profile from "./views/profile-page";
+import Tasks from "./views/tasks-page";
 <%=/empty%>import defaultLayout from "./layouts/<%=layout%>";
 import simpleLayout from "./layouts/single-card";
 
@@ -40,7 +40,7 @@ const router = new createRouter({
     {
       path: "/tasks",
       name: "tasks",
-      meta: { 
+      meta: {
         requiresAuth: true,
         layout: defaultLayout
       },

package/src/utility/run-command.js

@@ -1,11 +1,14 @@
 const spawn = require('child_process').spawn;
 
+const isWin = /^win/.test(process.platform);
+
 module.exports = function(commandName, args = [], customConfig = {}) {
     const forceNoCmd = customConfig.forceNoCmd;
-    const command = /^win/.test(process.platform) && !forceNoCmd ? `${commandName}.cmd` : commandName;
+    const command = isWin && !forceNoCmd ? `${commandName}.cmd` : commandName;
     const config = {
         stdio: 'inherit',
-        windowsVerbatimArguments: true
+        windowsVerbatimArguments: true,
+        shell: isWin ? false : true
     };
 
     if(customConfig) {