fix(browser-sync): update the mechanism to stop the server

1. Stop application server with browser-sync api 2. Run the application in non-watch mode
aurelia · Sep 3, 2019 · 3ffc7ec · 3ffc7ec
1 parent 1291be4
commit 3ffc7ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/skeleton/cli-bundler/aurelia_project/tasks/run.ext b/skeleton/cli-bundler/aurelia_project/tasks/run.ext
@@ -63,12 +63,11 @@ const run = gulp.series(
   done => { watch(reload); done(); }
 );
 
-const shutdownAppServer = (code) =>{
+const shutdownAppServer = () =>{
   return new Promise(resolve => {
     bs.exit();
-    process.exit(code || 0);
     resolve();
   });
 };
 
-export { run as default , shutdownAppServer };
+export { run as default, serve , shutdownAppServer };
diff --git a/skeleton/cypress/aurelia_project/tasks/cypress.ext b/skeleton/cypress/aurelia_project/tasks/cypress.ext
@@ -8,7 +8,12 @@ import * as config from '../../cypress.config';
 // @endif
 import { CLIOptions } from 'aurelia-cli';
 import * as project from '../aurelia.json';
+// @if feat["cli-bundler"]
+import { serve as runAppServer, shutdownAppServer } from './run';
+// @endif
+// @if feat.webpack
 import { default as runAppServer, shutdownAppServer } from './run';
+// @endif
 
 const runCypress = (cb) => {
   if (CLIOptions.hasFlag('run')) {
@@ -20,7 +25,7 @@ const runCypress = (cb) => {
           shutdownAppServer().then(cb);
         }
         else {
-          shutdownAppServer(1)
+          shutdownAppServer()
             .then(_ => {
               cb('Tests failed');
             });
@@ -34,8 +39,8 @@ const runCypress = (cb) => {
 
 export default (cb) => {
   if (CLIOptions.hasFlag('start')) {
-    runCypress(cb);
     runAppServer();
+    runCypress(cb);
     return;
   }
 

diff --git a/skeleton/protractor/aurelia_project/tasks/protractor.ext b/skeleton/protractor/aurelia_project/tasks/protractor.ext
@@ -7,7 +7,13 @@ import * as gulp from 'gulp';
 const {protractor, webdriver_update }  = require('gulp-protractor');
 
 import { CLIOptions } from 'aurelia-cli';
+// @if feat["cli-bundler"]
+import { serve as runAppServer, shutdownAppServer } from './run';
+// @endif
+// @if feat.webpack
 import { default as runAppServer, shutdownAppServer } from './run';
+// @endif
+
 
 function runApp(cb) {
   if (CLIOptions.hasFlag('start')) {
@@ -28,7 +34,7 @@ function runProtractor(cb) {
       shutdownAppServer().then(cb);
     })
     .on('error', () => {
-      shutdownAppServer(1).then(cb);
+      shutdownAppServer().then(cb);
     });
 }