fix(terminal/#3098): Fix windows terminal input (#3117)

- Add test case to verify terminal input is round-tripped back to the client - Fix #3098 (may require reverting the node 14 LTS upgrade) Fixes #3098
onivim · Feb 9, 2021 · cb8e5c2 · cb8e5c2
1 parent d2ed277
commit cb8e5c2
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 24 deletions.
diff --git a/.ci/esy-check-hygiene.yml b/.ci/esy-check-hygiene.yml
@@ -3,7 +3,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.15.4"
+      versionSpec: "12.17.0"
   - script: npm install -g esy@0.6.7
     displayName: 'npm install -g esy@0.6.7'
   - script: npm install -g yarn

diff --git a/.ci/js-build-steps.yml b/.ci/js-build-steps.yml
@@ -5,8 +5,8 @@ steps:
     displayName: 'js deps: install node-gyp'
   - script: node-gyp list
     displayName: 'js deps: node-gyp list'
-  - script: node-gyp install 14.15.4
-    displayName: 'js deps: node-gyp install 14.15.4'
+  - script: node-gyp install 12.17.0
+    displayName: 'js deps: node-gyp install 12.17.0'
   - script: node-gyp list
     displayName: 'js deps: node-gyp list'
   - script: node install-node-deps.js --prod	

diff --git a/.ci/use-node.yml b/.ci/use-node.yml
@@ -1,6 +1,6 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.15.4"
+      versionSpec: "12.17.0"
   - script: npm install -g rimraf
     displayName: "Install rimraf"
diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md
@@ -40,7 +40,6 @@
 
 ### Infrastructure / Refactoring
 
-- #3012 - Node: Upgrade from Node 12 LTS -> Node 14 LTS (related #3009)
 - #3101 - Dependency: reason-fzy -> 485cae1
 - #3096 - OS: Add logging for `readdir` path (related #3092)
 - #3097 - Configuration: Remove unused `workbench.tree.indent` setting
diff --git a/install-node-deps.js b/install-node-deps.js
@@ -5,7 +5,7 @@ const path = require("path")
 const rootDir = __dirname
 const vendorDir = path.join(rootDir, "vendor")
 
-const nodeVendorDir = path.join(vendorDir, "node-v14.15.4")
+const nodeVendorDir = path.join(vendorDir, "node-v12.17.0")
 const yarnScript = path.join(vendorDir, "yarn-v1.14.0", "yarn-1.14.0.js")
 
 let nodeBinaryPath

diff --git a/node/package.json b/node/package.json
@@ -24,9 +24,9 @@
     "typescript": "^3.3.3333"
   },
   "resolutions": {
-    "graceful-fs": "4.2.4",
+    "graceful-fs": "4.1.11",
     "debug": "3.2.6",
     "ms": "2.1.2",
-    "agent-base": "4.2.1"
+    "agent-base": "4.3.0"
   }
 }
diff --git a/node/yarn.lock b/node/yarn.lock
@@ -17,10 +17,10 @@
     vscode-proxy-agent "^0.5.2"
     vscode-regexpp "^3.1.0"
 
-agent-base@4, agent-base@4.2.1, agent-base@^4.3.0, agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@4, agent-base@4.3.0, agent-base@^4.3.0, agent-base@~4.2.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -81,10 +81,10 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-graceful-fs@4.2.3, graceful-fs@4.2.4, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+graceful-fs@4.1.11, graceful-fs@4.2.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"

diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
@@ -25,18 +25,18 @@ const getCygwinPath = (inputPath) => {
 }
 
 if (isWindows) {
-    nodePath = getCygwinPath(path.join(vendorPath, "node-v14.15.4", "win-x64", "node.exe"))
+    nodePath = getCygwinPath(path.join(vendorPath, "node-v12.17.0", "win-x64", "node.exe"))
     nodeScriptPath = getCygwinPath(nodeScriptPath)
     extensionsPath = getCygwinPath(extensionsPath)
     developmentExtensionsPath = getCygwinPath(developmentExtensionsPath)
     rgPath = getCygwinPath(path.join(rgPath, "windows", "rg.exe"))
     rlsPath = getCygwinPath(path.join(rlsPath, "bin.native.exe"))
 } else if (isMac) {
-    nodePath = path.join(vendorPath, "node-v14.15.4", "osx", "node")
+    nodePath = path.join(vendorPath, "node-v12.17.0", "osx", "node")
     rgPath = path.join(rgPath, "mac", "rg")
     rlsPath = path.join(rlsPath, "bin.native")
 } else if (isLinux) {
-    nodePath = path.join(vendorPath, "node-v14.15.4", "linux-x64", "node")
+    nodePath = path.join(vendorPath, "node-v12.17.0", "linux-x64", "node")
     rgPath = path.join(rgPath, "linux", "rg")
     rlsPath = path.join(rlsPath, "bin.native.linux")
 } else {

diff --git a/scripts/linux/package-linux.sh b/scripts/linux/package-linux.sh
@@ -31,7 +31,7 @@ cp _release/linux/bin/*.* _release/Onivim2.AppDir/usr/bin
 cp _release/linux/bin/Oni2 _release/Onivim2.AppDir/usr/bin/Oni2
 
 cp vendor/ripgrep-v0.10.0/linux/rg _release/Onivim2.AppDir/usr/bin/rg
-cp vendor/node-v14.15.4/linux-x64/node _release/Onivim2.AppDir/usr/bin/node
+cp vendor/node-v12.17.0/linux-x64/node _release/Onivim2.AppDir/usr/bin/node
 cp vendor/reason-language-server/bin.native.linux _release/Onivim2.AppDir/usr/bin/rls
 
 ls _release/Onivim2.AppDir/usr/share

diff --git a/scripts/release.js b/scripts/release.js
@@ -76,7 +76,7 @@ const getRipgrepPath = () => {
 }
 
 const getNodePath = () => {
-    const nodeDir = "node-v14.15.4"
+    const nodeDir = "node-v12.17.0"
 
     if (process.platform == "darwin") {
         return path.join(rootDirectory, "vendor", nodeDir, "osx", "node")