Skip to content

Commit 201e632

Browse files
wip. refactor
1 parent 9ac0725 commit 201e632

3 files changed

Lines changed: 12 additions & 17 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ module.exports = function(commandName, args = [], customConfig = {}) {
2424
console.log('----runCommand exit------>', code);
2525
code ? reject(code) : resolve(proc);
2626
});
27+
28+
if(config.noExit) {
29+
console.log('----runCommand resolve------>');
30+
resolve(proc);
31+
}
2732
});
2833

2934
promise.kill = (signal = 'SIGTERM') => {

packages/devextreme-cli/testing/app-template.test.shared.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module.exports = (env, { port } = { port: '8080' }) => {
7575
console.log('-------openPage--->', url);
7676
await page.goto('about:blank');
7777
await page.setViewport(viewport);
78-
await new Promise(resolve => setTimeout(resolve, 5000));
78+
await new Promise(resolve => setTimeout(resolve, 10000));
7979
console.log('-------openPage-goto-->', url, new Date().toLocaleTimeString());
8080
await page.goto(url, {
8181
waitUntil: 'networkidle0',

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ const fs = require('fs');
22
const path = require('path');
33
const WebServer = require('./web-server');
44

5-
const webServer = new WebServer();
65
const runCommand = require('../src/utility/run-command');
76
const { themes, swatchModes, baseFontFamily } = require('./constants');
87

9-
class nextJsState {
8+
class nextJsServer {
109
constructor(env) {
1110
this.proc = null;
1211
this.env = env;
@@ -38,26 +37,17 @@ module.exports = class DevServer {
3837

3938
constructor(env) {
4039
this.env = env;
41-
42-
if(this.isNextJs()) {
43-
this.nextJsState = new nextJsState(this.env);
44-
}
40+
this.server = this.isNextJs()
41+
? new nextJsServer(this.env)
42+
: new WebServer();
4543
}
4644

4745
async start() {
48-
if(this.isNextJs()) {
49-
await this.nextJsState.start();
50-
} else {
51-
await webServer.start(this.env.deployPath);
52-
}
46+
await this.server.start(this.env.deployPath);
5347
}
5448

5549
async stop() {
56-
if(this.isNextJs()) {
57-
await this.nextJsState.stop();
58-
} else {
59-
await webServer.stop();
60-
}
50+
await this.server.stop();
6151
}
6252

6353
async build() {

0 commit comments

Comments
 (0)