refactor

Author: VasilyStrelyaev

packages/devextreme-cli/src/application.js

@@ -2,7 +2,7 @@ const angularApplication = require('./applications/application.angular');
 const reactApplication = require('./applications/application.react');
 const nextjsApplication = require('./applications/application.nextjs');
 const vueApplication = require('./applications/application.vue');
-const getReactScaffoldToolInfo = require('./utility/prompts/react-tool');
+const getReactAppType = require('./utility/prompts/react-app-type');
 const printHelp = require('./help').printHelp;
 
 const isApplicationCommand = (command) => {
@@ -21,18 +21,14 @@ const run = async(commands, options, devextremeConfig) => {
         const appName = commands[2] || 'my-app';
 
         if(app === 'react-app') {
-            const reactAppType = await getReactScaffoldToolInfo(options['scaffold-tool']);
-
-            if(reactAppType === 'nextjs') {
-                app = 'nextjs-app';
-            }
+            app = await getReactAppType(options['react-app-type']);
         }
 
         switch(app) {
             case 'angular-app':
                 await angularApplication.create(appName, options);
                 return;
-            case 'react-app':
+            case 'vite-app':
                 await reactApplication.create(appName, options);
                 return;
             case 'nextjs-app':

…me-cli/src/utility/prompts/react-tool.js …li/src/utility/prompts/react-app-type.jspackages/devextreme-cli/src/utility/prompts/react-tool.js renamed to packages/devextreme-cli/src/utility/prompts/react-app-type.js packages/devextreme-cli/src/utility/prompts/react-tool.js renamed to packages/devextreme-cli/src/utility/prompts/react-app-type.js

@@ -1,8 +1,8 @@
 const prompts = require('./prompts');
 
 const choices = [
-    { value: 'vite', title: 'React+Vite' },
-    { value: 'nextjs', title: 'Next.js-based' }
+    { value: 'vite-app', title: 'React+Vite' },
+    { value: 'nextjs-app', title: 'Next.js-based' }
 ];
 
 const question = {

packages/devextreme-cli/testing/env.react.js

@@ -29,11 +29,10 @@ function getConfig({ engine, template, fileExtension, templateExtension, transpi
         await runCommand('node', [
             path.join(process.cwd(), './index.js'),
             'new',
-            'react-app',
+            'vite-app',
             '--layout=side-nav-outer-toolbar',
             `--template=${template}`,
             `--transpiler=${transpiler}`,
-            '--scaffold-tool=vite',
             ...additionalArguments
         ], {
             cwd: sandboxPath,