feat: add support for Node.js 22

Financial-Times · Apr 26, 2024 · e083794 · e083794
1 parent 6716eca
commit e083794
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 51 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ references:
       - image: cimg/node:<< parameters.node-version >>
     parameters:
       node-version:
-        default: "18.19" # We default to the highest active LTS
+        default: "20.12" # We default to the highest active LTS
         type: string
 
   workspace_root: &workspace_root ~/project
@@ -157,29 +157,29 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - test:
           requires:
             - build-v<< matrix.node-version >>
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - lint:
           requires:
             - build-v<< matrix.node-version >>
           name: lint-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - release-please:
           filters:
             <<: *filters_only_main
           requires:
             # We release on the highest active LTS version of
             # Node.js that we support
-            - test-v20.10
-            - lint-v20.10
+            - test-v20.12
+            - lint-v20.12
 
   build-test-publish:
     jobs:
@@ -189,7 +189,7 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - test:
           filters:
             <<: *filters_release_build
@@ -198,7 +198,7 @@ workflows:
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - lint:
           filters:
             <<: *filters_release_build
@@ -207,16 +207,16 @@ workflows:
           name: lint-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - publish:
           context: npm-publish-token
           filters:
             <<: *filters_release_build
           requires:
             # We release on the highest active LTS version of
             # Node.js that we support
-            - lint-v20.10
-            - test-v20.10
+            - lint-v20.12
+            - test-v20.12
 
   build-test-prepublish:
     jobs:
@@ -226,7 +226,7 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - test:
           filters:
             <<: *filters_prerelease_build
@@ -235,7 +235,7 @@ workflows:
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - lint:
           filters:
             <<: *filters_prerelease_build
@@ -244,16 +244,16 @@ workflows:
           name: lint-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - prepublish:
           context: npm-publish-token
           filters:
             <<: *filters_prerelease_build
           requires:
             # We release on the highest active LTS version of
             # Node.js that we support
-            - lint-v20.10
-            - test-v20.10
+            - lint-v20.12
+            - test-v20.12
 
   nightly:
     triggers:
@@ -267,12 +267,12 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
       - test:
           requires:
             - build-v<< matrix.node-version >>
           context: next-nightly-build
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: [ "20.10", "18.19" ]
+              node-version: [ "22.0", "20.12", "18.20" ]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "volta": {

diff --git a/packages/app-info/package.json b/packages/app-info/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: app-info\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib/index.js",

diff --git a/packages/crash-handler/package.json b/packages/crash-handler/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: crash-handler\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: errors\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib"

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: eslint-config\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib/index.js",

diff --git a/packages/fetch-error-handler/package.json b/packages/fetch-error-handler/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: fetch-error-handler\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/log-error/package.json b/packages/log-error/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: log-error\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: logger\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/logger/test/end-to-end/helpers/split-and-parse-json-logs.js b/packages/logger/test/end-to-end/helpers/split-and-parse-json-logs.js
@@ -7,11 +7,16 @@
  *     Returns the parsed JSON logs as an array of log objects.
  */
 function splitAndParseJsonLogs(logString) {
-	return logString
-		.trim()
-		.split(/\n+/g)
-		.filter((log) => log.trim())
-		.map((log) => JSON.parse(log));
+	return (
+		logString
+			.trim()
+			.split(/\n+/g)
+			.filter((log) => log.trim())
+			// Node.js sometimes logs deprecation warnings which are not valid JSON.
+			// We need to filter these out so we don't error in our JSON.parse map
+			.filter((log) => !log.toLowerCase().includes('deprecation'))
+			.map((log) => JSON.parse(log))
+	);
 }
 
 module.exports = splitAndParseJsonLogs;
diff --git a/packages/middleware-log-errors/package.json b/packages/middleware-log-errors/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: middleware-log-errors\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/middleware-render-error-info/package.json b/packages/middleware-render-error-info/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: middleware-render-error-info\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib",

diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
@@ -11,7 +11,7 @@
 	"bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: opentelemetry\"",
 	"license": "MIT",
 	"engines": {
-		"node": "18.x || 20.x",
+		"node": "18.x || 20.x || 22.x",
 		"npm": "8.x || 9.x || 10.x"
 	},
 	"main": "lib",

diff --git a/packages/serialize-error/package.json b/packages/serialize-error/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: serialize-error\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib/index.js",

diff --git a/packages/serialize-request/package.json b/packages/serialize-request/package.json
@@ -11,7 +11,7 @@
   "bugs": "https://github.com/Financial-Times/dotcom-reliability-kit/issues?q=label:\"package: serialize-request\"",
   "license": "MIT",
   "engines": {
-    "node": "18.x || 20.x",
+    "node": "18.x || 20.x || 22.x",
     "npm": "8.x || 9.x || 10.x"
   },
   "main": "lib/index.js",