wip. refactor

Author: GoodDayForSurf

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

@@ -21,13 +21,11 @@ module.exports = function(commandName, args = [], customConfig = {}) {
 
     const promise = new Promise((resolve, reject) => {
         proc.on('exit', (code) => {
-            console.log('----runCommand exit------>', code);
-            code ? reject(code) : resolve(proc);
+            code ? reject(code) : resolve({ proc });
         });
 
-        if(config.noExit) {
-            console.log('----runCommand resolve------>');
-            resolve(proc);
+        if(config.detached) {
+            resolve({ proc });
         }
     });
 

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

@@ -1,35 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 const WebServer = require('./web-server');
+const NextJsServer = require('./nextjs-server');
 
 const runCommand = require('../src/utility/run-command');
 const { themes, swatchModes, baseFontFamily } = require('./constants');
 
-class nextJsServer {
-    constructor(env) {
-        this.proc = null;
-        this.env = env;
-    }
-
-    async start() {
-        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;
-    }
-
-    stop() {
-        if(this.proc) {
-            this.proc.kill();
-        }
-    }
-}
-
 module.exports = class DevServer {
     isNextJs() {
         return this.env.engine.indexOf('nextjs') === 0;
@@ -38,7 +14,7 @@ module.exports = class DevServer {
     constructor(env) {
         this.env = env;
         this.server = this.isNextJs()
-            ? new nextJsServer(this.env)
+            ? new NextJsServer(this.env)
             : new WebServer();
     }
 

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

@@ -0,0 +1,24 @@
+const runCommand = require('../src/utility/run-command');
+
+module.exports = class NextJsServer {
+    constructor(env) {
+        this.proc = null;
+        this.env = env;
+    }
+
+    async start() {
+        ({ proc: this.proc } = await runCommand('npm', ['run', 'start'], {
+            cwd: this.env.appPath,
+            detached: true,
+            // https://github.com/facebook/create-react-app/issues/3657
+            env: Object.assign(process.env, { CI: false })
+        }));
+    }
+
+    stop() {
+        if(this.proc) {
+            this.proc.kill('SIGTERM');
+        }
+    }
+};
+