From 9317e791c99e64e2fea684ce393f7ab56b0b5e36 Mon Sep 17 00:00:00 2001
From: Alexander Sperling <alexander@sprlng.de>
Date: Wed, 8 May 2024 11:34:00 +0200
Subject: [PATCH 1/3] fix: Update node version

* Update node version to solve CVE-2024-21892
---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6f9a77b9e8e3..9663e77c6602 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@types/express": "^4.17.17",
     "@types/http-proxy": "1.17.7",
     "@types/js-yaml": "^4.0.6",
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.19.1",
     "@types/pem": "^1.14.1",
     "@types/proxy-from-env": "^1.0.1",
     "@types/safe-compare": "^1.1.0",
@@ -88,7 +88,7 @@
     "xdg-basedir": "^4.0.0"
   },
   "resolutions": {
-    "@types/node": "^18.0.0"
+    "@types/node": "^18.19.1"
   },
   "bin": {
     "code-server": "out/node/entry.js"
diff --git a/yarn.lock b/yarn.lock
index 05da0278c415..adf01f0629d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -284,10 +284,10 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/node@*", "@types/node@^18.0.0":
-  version "18.19.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb"
-  integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==
+"@types/node@*", "@types/node@^18.19.1":
+  version "18.19.32"
+  resolved "https://bahnhub.tech.rz.db.de:443/artifactory/api/npm/default-npm-3rdparty/@types/node/-/node-18.19.32.tgz#96e4c80dca0ccf48505add2a399f36465955e0be"
+  integrity sha512-2bkg93YBSDKk8DLmmHnmj/Rwr18TLx7/n+I23BigFwgexUJoMHZOd8X1OFxuF/W3NN0S2W2E5sVabI5CPinNvA==
   dependencies:
     undici-types "~5.26.4"
 

From edadbc9cdb98511de95c70f3415decc0210d1c30 Mon Sep 17 00:00:00 2001
From: Alexander Sperling <alexander@sprlng.de>
Date: Mon, 27 May 2024 09:24:01 +0200
Subject: [PATCH 2/3] chore: Update to latest supported version

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9663e77c6602..b3114b57e376 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@types/express": "^4.17.17",
     "@types/http-proxy": "1.17.7",
     "@types/js-yaml": "^4.0.6",
-    "@types/node": "^18.19.1",
+    "@types/node": "20.11.1",
     "@types/pem": "^1.14.1",
     "@types/proxy-from-env": "^1.0.1",
     "@types/safe-compare": "^1.1.0",
@@ -88,7 +88,7 @@
     "xdg-basedir": "^4.0.0"
   },
   "resolutions": {
-    "@types/node": "^18.19.1"
+    "@types/node": "20.11.1"
   },
   "bin": {
     "code-server": "out/node/entry.js"
diff --git a/yarn.lock b/yarn.lock
index 3426d84dd808..9e2a57237128 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -284,10 +284,10 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/node@*", "@types/node@^18.19.1":
-  version "18.19.32"
-  resolved "https://bahnhub.tech.rz.db.de:443/artifactory/api/npm/default-npm-3rdparty/@types/node/-/node-18.19.32.tgz#96e4c80dca0ccf48505add2a399f36465955e0be"
-  integrity sha512-2bkg93YBSDKk8DLmmHnmj/Rwr18TLx7/n+I23BigFwgexUJoMHZOd8X1OFxuF/W3NN0S2W2E5sVabI5CPinNvA==
+"@types/node@*", "@types/node@20.11.1":
+  version "20.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.1.tgz#6a93f94abeda166f688d3d2aca18012afbe5f850"
+  integrity sha512-DsXojJUES2M+FE8CpptJTKpg+r54moV9ZEncPstni1WHFmTcCzeFLnMFfyhCVS8XNOy/OQG+8lVxRLRrVHmV5A==
   dependencies:
     undici-types "~5.26.4"
 

From d2b6bd3cc730af40881db0fa53940d953a3f4617 Mon Sep 17 00:00:00 2001
From: Alexander Sperling <alexander@sprlng.de>
Date: Mon, 27 May 2024 09:25:16 +0200
Subject: [PATCH 3/3] chore: Rebase

---
 lib/vscode | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vscode b/lib/vscode
index dc96b837cf6b..e170252f7626 160000
--- a/lib/vscode
+++ b/lib/vscode
@@ -1 +1 @@
-Subproject commit dc96b837cf6bb4af9cd736aa3af08cf8279f7685
+Subproject commit e170252f762678dec6ca2cc69aba1570769a5d39