From 99ec82ab5586327f7126b0ef53ff0cd5a5bdceec Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 27 May 2019 15:38:07 +0200 Subject: [PATCH] fix(core): update --- package-lock.json | 16 ++++++++-------- package.json | 2 +- ts/tswatch.classes.watcher.ts | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 095a584..ffa5046 100644 --- a/package-lock.json +++ b/package-lock.json @@ -276,9 +276,9 @@ } }, "@pushrocks/smartexit": { - "version": "1.0.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.10.tgz", - "integrity": "sha512-ngPeF3T2KtgT0a3Vmm1S9J6Ksw452fPyJzQwYu2Fn/iWGzuDgykz68fiq2F++EqDHu7Djbrun54ubXVjkuU+1g==", + "version": "1.0.11", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.11.tgz", + "integrity": "sha512-zQTmmHQFwTC0tta+mcfkA9gVYR0OT9hKtiYGIW5wnOLFc3FxRREfIwuatxI1UwJ+CDCjy9IgNL6WWqZP+2VMeQ==", "requires": { "@pushrocks/lik": "^3.0.5", "@pushrocks/smartdelay": "^2.0.3" @@ -375,11 +375,11 @@ } }, "@pushrocks/smartshell": { - "version": "2.0.17", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.17.tgz", - "integrity": "sha512-hPQD0Hk9x0FdhggrtBpDH+mb018oVveNOILaCSiVdOuBXb4UnS2WeNixHiGWWRwppH3anpUJ5iW+3Lo/VFUzOQ==", + "version": "2.0.20", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.20.tgz", + "integrity": "sha512-wA6crDGvEK7s9jTA5hJPjirTYs/1Wbt5zcAp/0AbB9Qxkzj/+alVueBGvD9NrXYhfn5EFeelwS5/Oy4lLm3A7A==", "requires": { - "@pushrocks/smartexit": "^1.0.10", + "@pushrocks/smartexit": "^1.0.11", "@pushrocks/smartpromise": "^3.0.2", "@types/which": "^1.3.1", "which": "^1.3.1" @@ -541,7 +541,7 @@ }, "@types/which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.1.tgz", + "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-1.3.1.tgz", "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==" }, "@types/yargs": { diff --git a/package.json b/package.json index 1ffa740..ad94ad5 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,6 @@ "@pushrocks/smartdelay": "^2.0.3", "@pushrocks/smartlog": "^2.0.19", "@pushrocks/smartlog-destination-local": "^7.0.5", - "@pushrocks/smartshell": "^2.0.17" + "@pushrocks/smartshell": "^2.0.20" } } diff --git a/ts/tswatch.classes.watcher.ts b/ts/tswatch.classes.watcher.ts index 1f18fda..160f39c 100644 --- a/ts/tswatch.classes.watcher.ts +++ b/ts/tswatch.classes.watcher.ts @@ -90,7 +90,7 @@ export class Watcher { */ public async stop() { await this.smartchokWatcher.stop(); - if (!this.currentExecution.childProcess.killed) { + if (this.currentExecution && !this.currentExecution.childProcess.killed) { process.kill(-this.currentExecution.childProcess.pid); } }