reh-node16.patch 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
  2. index 595d0ce..2e94d99 100644
  3. --- a/build/gulpfile.reh.js
  4. +++ b/build/gulpfile.reh.js
  5. @@ -375,10 +375,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  6. - if (platform === 'linux' || platform === 'alpine') {
  7. - result = es.merge(result,
  8. - gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
  9. - .pipe(rename(`bin/helpers/check-requirements.sh`))
  10. - .pipe(util.setExecutableBit())
  11. - );
  12. - }
  13. -
  14. return result.pipe(vfs.dest(destination));
  15. diff --git a/remote/.yarnrc b/remote/.yarnrc
  16. index cac528f..0d11e36 100644
  17. --- a/remote/.yarnrc
  18. +++ b/remote/.yarnrc
  19. @@ -1,3 +1,3 @@
  20. disturl "https://nodejs.org/dist"
  21. -target "18.17.1"
  22. +target "16.20.2"
  23. ms_build_id "255375"
  24. diff --git a/remote/package.json b/remote/package.json
  25. index b1fbc7b..87716c0 100644
  26. --- a/remote/package.json
  27. +++ b/remote/package.json
  28. @@ -31,3 +31,3 @@
  29. "native-watchdog": "^1.4.1",
  30. - "node-pty": "1.1.0-beta5",
  31. + "node-pty": "1.1.0-beta4",
  32. "tas-client-umd": "0.1.8",
  33. diff --git a/remote/yarn.lock b/remote/yarn.lock
  34. index bb20531..8f7c051 100644
  35. --- a/remote/yarn.lock
  36. +++ b/remote/yarn.lock
  37. @@ -433,6 +433,6 @@ node-gyp-build@^4.3.0:
  38. -node-pty@1.1.0-beta5:
  39. - version "1.1.0-beta5"
  40. - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta5.tgz#364386b7058a93070234064f13164ec1ef914993"
  41. - integrity sha512-j3QdgFHnLY0JWxztrvM3g67RaQLOGvytv+C6mFu0PqD+JILlzqfwuoyqRqVxdZZjoOTUXPfSRj1qPVCaCH+eOw==
  42. +node-pty@1.1.0-beta4:
  43. + version "1.1.0-beta4"
  44. + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta4.tgz#ee74d909c9f422ffc7f675e1092529673f8906ec"
  45. + integrity sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==
  46. dependencies:
  47. diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh
  48. index e3d96bd..3df32df 100644
  49. --- a/resources/server/bin/code-server-linux.sh
  50. +++ b/resources/server/bin/code-server-linux.sh
  51. @@ -11,22 +11,2 @@ ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
  52. -# Do not remove this check.
  53. -# Provides a way to skip the server requirements check from
  54. -# outside the install flow. A system process can create this
  55. -# file before the server is downloaded and installed.
  56. -skip_check=0
  57. -if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
  58. - echo "!!! WARNING: Skipping server pre-requisite check !!!"
  59. - echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
  60. - skip_check=1
  61. -fi
  62. -
  63. -# Check platform requirements
  64. -if [ "$(echo "$@" | grep -c -- "--skip-requirements-check")" -eq 0 ] && [ $skip_check -eq 0 ]; then
  65. - $ROOT/bin/helpers/check-requirements.sh
  66. - exit_code=$?
  67. - if [ $exit_code -ne 0 ]; then
  68. - exit $exit_code
  69. - fi
  70. -fi
  71. -
  72. "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"