wip. refactor

Author: GoodDayForSurf

packages/devextreme-cli/src/utility/run-command.js

@@ -20,15 +20,10 @@ module.exports = function(commandName, args = [], customConfig = {}) {
     const proc = spawn(command, args, config);
 
     const promise = new Promise((resolve, reject) => {
-        if(!config.noExit) {
-            proc.on('exit', (code) => {
-                console.log('----runCommand exit------>', code);
-                code ? reject(code) : resolve();
-            });
-        } else {
-            console.log('----runCommand resolve------>');
-            resolve();
-        }
+        proc.on('exit', (code) => {
+            console.log('----runCommand exit------>', code);
+            code ? reject(code) : resolve(proc);
+        });
     });
 
     promise.kill = (signal = 'SIGTERM') => {

packages/devextreme-cli/testing/dev-server.js

@@ -5,44 +5,51 @@ const WebServer = require('./web-server');
 const webServer = new WebServer();
 const runCommand = require('../src/utility/run-command');
 const { themes, swatchModes, baseFontFamily } = require('./constants');
-let startedPromise = null;
 
-module.exports = class DevServer {
-    constructor(env) {
-        this.env = env;
+class nextJsState {
+    async start(env) {
+        this.proc = runCommand('npm', ['run', 'start'], {
+            cwd: this.env.appPath,
+            noExit: true,
+            detached: true,
+            // https://github.com/facebook/create-react-app/issues/3657
+            env: Object.assign(process.env, { CI: false })
+        });
+
+        await this.proc;
     }
 
-    async start() {
-        if(this.env.engine.indexOf('nextjs') === 0) {
-            /* if(startedPromise) {
-                await startedPromise.kill();
-            } */
+    stop() {
+        if(this.proc) {
+            this.proc.kill();
+        }
+    }
+}
 
-            console.log('-----start----->', this.env.appPath);
+module.exports = class DevServer {
+    isNextJs() {
+        return this.env.engine.indexOf('nextjs') === 0;
+    }
 
-            startedPromise = runCommand('npm', ['run', 'start'], {
-                cwd: this.env.appPath,
-                noExit: true,
-                detached: true,
-                // https://github.com/facebook/create-react-app/issues/3657
-                env: Object.assign(process.env, { CI: false })
-            });
+    constructor(env) {
+        this.env = env;
 
-            await startedPromise;
+        if(this.isNextJs()) {
+            this.nextJsState = new nextJsState();
+        }
+    }
 
-            console.log('-----start--runCommand-executed-->');
+    async start() {
+        if(this.isNextJs()) {
+            await this.nextJsState.start();
         } else {
             await webServer.start(this.env.deployPath);
         }
     }
 
     async stop() {
-        if(this.env.engine.indexOf('nextjs') === 0) {
-            if(startedPromise) {
-                console.log('----server.stop()------>');
-                await startedPromise.kill();
-                startedPromise = null;
-            }
+        if(this.isNextJs()) {
+            await this.nextJsState.stop();
         } else {
             await webServer.stop();
         }