From e4db80667e543226cb3cb77c6be08ad48964ca42 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 29 Mar 2021 14:05:59 -0700 Subject: [PATCH 1/2] refactor: use stdio correctly in wrapper --- src/node/wrapper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 28803fe9c..7330ab4d2 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -314,7 +314,7 @@ export class ParentProcess extends Process { CODE_SERVER_PARENT_PID: process.pid.toString(), NODE_OPTIONS: `--max-old-space-size=2048 ${process.env.NODE_OPTIONS || ""}`, }, - stdio: ["ipc"], + stdio: ["inherit", "pipe", "pipe", "ipc"], }) } From df6bfbbeaf6f2bc0d879265f956f0d27ba8f4b48 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 29 Mar 2021 14:06:11 -0700 Subject: [PATCH 2/2] feat: bump ts-node to 9.1.1 --- package.json | 2 +- src/node/wrapper.ts | 2 +- yarn.lock | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a86b4e670..1dfde5b63 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "prettier-plugin-sh": "^0.6.0", "stylelint": "^13.0.0", "stylelint-config-recommended": "^4.0.0", - "ts-node": "~9.0.0", + "ts-node": "^9.1.1", "typescript": "^4.1.3", "wtfnode": "^0.8.4" }, diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 7330ab4d2..68eacbbca 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -314,7 +314,7 @@ export class ParentProcess extends Process { CODE_SERVER_PARENT_PID: process.pid.toString(), NODE_OPTIONS: `--max-old-space-size=2048 ${process.env.NODE_OPTIONS || ""}`, }, - stdio: ["inherit", "pipe", "pipe", "ipc"], + stdio: ["inherit", "inherit", "inherit", "ipc"], }) } diff --git a/yarn.lock b/yarn.lock index 63c2d46cd..513114e39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2415,6 +2415,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@^6.0.4: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -7517,12 +7522,13 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -ts-node@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== +ts-node@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" + integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17"