From 637510f19bfc999fdfe29f13ea3bd6c7446518a3 Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Fri, 14 Dec 2018 15:25:03 +0000 Subject: [PATCH 1/5] test: add node@10,11 + 12 :-\ --- .travis.yml | 4 +++- package-lock.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4a7dcdc..7fb5d8dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ cache: notifications: email: false node_js: - - '9' + - '12' + - '11' + - '10' - '8' - '6' - '4' diff --git a/package-lock.json b/package-lock.json index 7a14faf5..1495d08d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2367,7 +2367,7 @@ }, "got": { "version": "6.7.1", - "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "requires": { "create-error-class": "^3.0.0", From e14d001d2414473f414650fd2cbc6fa14db60a5c Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Fri, 14 Dec 2018 15:30:12 +0000 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20there=20is=20no=2012=E2=80=A6?= =?UTF-8?q?=F0=9F=A5=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7fb5d8dc..b6b03bd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ cache: notifications: email: false node_js: - - '12' - '11' - '10' - '8' From 5a0589c2ec09aac3ccba3175a71ad4510f52e94d Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Fri, 14 Dec 2018 15:57:40 +0000 Subject: [PATCH 3/5] fix: hand stdin back to nodemon in node11 Fixes #1490 --- lib/monitor/run.js | 2 ++ package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/monitor/run.js b/lib/monitor/run.js index 8a1033dd..651afef2 100644 --- a/lib/monitor/run.js +++ b/lib/monitor/run.js @@ -151,6 +151,8 @@ function run(options) { }); child.on('exit', function (code, signal) { + process.stdin.unpipe(child.stdin); + if (code === 127) { utils.log.error('failed to start process, "' + cmd.executable + '" exec not found'); diff --git a/package-lock.json b/package-lock.json index 1495d08d..ff5dd508 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4369,9 +4369,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "pstree.remy": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.3.tgz", - "integrity": "sha512-tGkOSvpMp0j7hskA4izvP0onujJSEAYO0SViHtjJX5a+4cqxVXiq32opahQO4HkA7bnHsRk9xgrf6LVvG/Q9UA==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.4.tgz", + "integrity": "sha512-3kSyTN/iTJMxtL87idnFgTyOp2vQ6B/49QcHUO26kh2M2qahlUivFI1zWJ9FRFPoB+KgcP820JMOuIhkBJAP3Q==" }, "punycode": { "version": "1.4.1", diff --git a/package.json b/package.json index 59f2cd6a..7dde1469 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "debug": "^3.1.0", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.3", + "pstree.remy": "^1.1.4", "semver": "^5.5.0", "supports-color": "^5.2.0", "touch": "^3.1.0", From aa0f579be7ffef3a092c519b883f442512a0a517 Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Fri, 14 Dec 2018 16:20:16 +0000 Subject: [PATCH 4/5] chore: defensive checking --- lib/monitor/run.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/monitor/run.js b/lib/monitor/run.js index 651afef2..e316c2b1 100644 --- a/lib/monitor/run.js +++ b/lib/monitor/run.js @@ -151,7 +151,9 @@ function run(options) { }); child.on('exit', function (code, signal) { - process.stdin.unpipe(child.stdin); + if (child && child.stdin) { + process.stdin.unpipe(child.stdin); + } if (code === 127) { utils.log.error('failed to start process, "' + cmd.executable + From 985d9ecab06650805b67dbbb66e44380e6cfe332 Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Fri, 14 Dec 2018 17:26:29 +0000 Subject: [PATCH 5/5] fix: ensure latest pstree.remy --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff5dd508..dbaa9965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4369,9 +4369,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "pstree.remy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.4.tgz", - "integrity": "sha512-3kSyTN/iTJMxtL87idnFgTyOp2vQ6B/49QcHUO26kh2M2qahlUivFI1zWJ9FRFPoB+KgcP820JMOuIhkBJAP3Q==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.6.tgz", + "integrity": "sha512-NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w==" }, "punycode": { "version": "1.4.1", diff --git a/package.json b/package.json index 7dde1469..11bcdae6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "debug": "^3.1.0", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.4", + "pstree.remy": "^1.1.6", "semver": "^5.5.0", "supports-color": "^5.2.0", "touch": "^3.1.0",