From 4d813fa01bb9170f4e0a91d0f3f5234bc163d501 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 21 Aug 2022 17:12:24 -0400
Subject: [PATCH 1/4] test: fix @types/node version in tests re: #12297

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 8434ae258a1..856290dcf29 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@babel/preset-env": "7.10.4",
     "@typescript-eslint/eslint-plugin": "4.10.0",
     "@typescript-eslint/parser": "4.10.0",
+    "@types/node": "16.x",
     "acquit": "1.x",
     "acquit-ignore": "0.1.x",
     "acquit-require": "0.1.x",

From b9e985c629e05a9a73f23ae42027e6c215c6a9d1 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 21 Aug 2022 17:16:39 -0400
Subject: [PATCH 2/4] test: more strict @types/node version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 856290dcf29..4a70cd5cb62 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@babel/preset-env": "7.10.4",
     "@typescript-eslint/eslint-plugin": "4.10.0",
     "@typescript-eslint/parser": "4.10.0",
-    "@types/node": "16.x",
+    "@types/node": "16.11.23",
     "acquit": "1.x",
     "acquit-ignore": "0.1.x",
     "acquit-require": "0.1.x",

From dfc4ad750bf91ae5743ed8dce676bf5a96041a6d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 21 Aug 2022 19:12:33 -0400
Subject: [PATCH 3/4] test: try upgrading npm for node v4 tests re: #12297

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c1b78b454e..7a4eb6af80d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - name: Upgrade Node 5 npm
+      - name: Upgrade Node <= 5 npm
         run: npm install -g npm@3
-        if: ${{ matrix.node == 5 }}
+        if: ${{ matrix.node <= 5 }}
 
       - run: npm install
 

From a1144dc0220929de0e9b7faf93d793c10e77f094 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 21 Aug 2022 19:19:33 -0400
Subject: [PATCH 4/4] test: run node 7 tests with upgraded npm re: #12297

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7a4eb6af80d..861870b0dc7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,10 @@ jobs:
         run: npm install -g npm@3
         if: ${{ matrix.node <= 5 }}
 
+      - name: Upgrade Node 7 npm
+        run: npm install -g npm@6
+        if: ${{ matrix.node == 7 }}
+
       - run: npm install
 
       - name: Setup