From 48844789ee32c81d6b9847e1bdf691f2ab768431 Mon Sep 17 00:00:00 2001
From: Jorge Sanz <jorge.sanz@elastic.co>
Date: Wed, 15 Jan 2025 15:56:01 +0100
Subject: [PATCH] Upgrade to Node 22 (#552)

* Upgrade to Node 22

* Fix typo

* Upgrade @types/node

(cherry picked from commit a000bb31aa9991d935bdeeca4974cf277ab36085)

# Conflicts:
#	yarn.lock
---
 .buildkite/pipeline.yml |  2 +-
 .nvmrc                  |  2 +-
 package.json            |  4 ++--
 yarn.lock               | 34 +++++++++++++++++++++++++++++-----
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 37fcc8c..c5eb939 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 agents:
-  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node20:0.5@sha256:01d63c1c1e9895e410a8b50c0eb0ce8e986c354085a11ed1d00355a12935ac5e"
+  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node22:0.5@sha256:b14dcc6455b0678a5f76108ddabbb5c9f1455c8fc4445b03e31e7dc0f12a025d"
   cpu: "2"
   memory: "2G"
 
diff --git a/.nvmrc b/.nvmrc
index 9de2256..deed13c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-lts/iron
+lts/jod
diff --git a/package.json b/package.json
index 149ee67..66cfd38 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.14",
     "@types/lru-cache": "5.1.1",
-    "@types/node": "20.17.13",
+    "@types/node": "22.10.6",
     "@types/semver": "7.5.8",
     "@types/topojson-specification": "1.0.5",
     "@typescript-eslint/eslint-plugin": "8.20.0",
@@ -72,6 +72,6 @@
     "typescript-eslint": "8.20.0"
   },
   "engines": {
-    "node": ">=18 <=20"
+    "node": ">=18 <=22"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index adffa46..61d17da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1462,12 +1462,12 @@
   dependencies:
     undici-types "~6.20.0"
 
-"@types/node@20.17.13":
-  version "20.17.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.13.tgz#26a7d3e72724ed73bc2fd39a66a2ab17e6e19a00"
-  integrity sha512-RNf+4dEeV69PIvyp++4IKM2vnLXtmp/JovfeQm5P5+qpKb6wHoH7INywLdZ7z+gVX46kgBP/fwJJvZYaHxtdyw==
+"@types/node@22.10.6":
+  version "22.10.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.6.tgz#5c6795e71635876039f853cbccd59f523d9e4239"
+  integrity sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==
   dependencies:
-    undici-types "~6.19.2"
+    undici-types "~6.20.0"
 
 "@types/semver@7.5.8":
   version "7.5.8"
@@ -3635,10 +3635,34 @@ typescript@5.7.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
   integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==
 
+<<<<<<< HEAD
 undici-types@~6.19.2:
   version "6.19.8"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
   integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+=======
+typewise-core@^1.2, typewise-core@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"
+  integrity sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==
+
+typewise@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typewise/-/typewise-1.0.3.tgz#1067936540af97937cc5dcf9922486e9fa284651"
+  integrity sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==
+  dependencies:
+    typewise-core "^1.2.0"
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+undici-types@~6.20.0:
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
+  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
+>>>>>>> a000bb3 (Upgrade to Node 22 (#552))
 
 undici-types@~6.20.0:
   version "6.20.0"