From 8aef1b549b3f0fd361918acdafcf6547024e42de Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivo.murrell@ft.com>
Date: Tue, 1 Mar 2022 16:28:22 +0000
Subject: [PATCH 1/3] Update to node 16 and test node 14 in the CI

---
 .circleci/config.yml | 52 +++++++++++++++++++++++++++++++++++++++-----
 package.json         |  4 ++--
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1dd7c7..8b06112 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,11 @@ references:
     &container_config_node
     working_directory: ~/project/build
     docker:
-      - image: cimg/node:12.22-browsers
+      - image: cimg/node:<< parameters.node-version >>-browsers
+    parameters:
+      node-version:
+        default: "16.14"
+        type: string
 
   workspace_root: &workspace_root ~/project
 
@@ -140,26 +144,46 @@ workflows:
       - build:
           filters:
             <<: *filters_ignore_tags_renovate_nori
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   build-test-publish:
     jobs:
       - build:
           filters:
             <<: *filters_version_tag
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           filters:
             <<: *filters_version_tag
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - publish:
           context: npm-publish-token
           filters:
             <<: *filters_version_tag
           requires:
-            - test
+            - test-v<< matrix.node-version >>
+          name: publish-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   renovate-nori-build-test:
     jobs:
@@ -170,9 +194,17 @@ workflows:
       - build:
           requires:
             - waiting-for-approval
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   nightly:
     triggers:
@@ -183,10 +215,18 @@ workflows:
     jobs:
       - build:
           context: next-nightly-build
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
           context: next-nightly-build
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
 notify:
   webhooks:
diff --git a/package.json b/package.json
index d7d0ddb..4d7dd45 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": "12.x",
+    "node": "14.x || 16.x",
     "npm": "7.x || 8.x"
   },
   "scripts": {
@@ -38,7 +38,7 @@
     }
   },
   "volta": {
-    "node": "12.22.5",
+    "node": "16.14.0",
     "npm": "7.20.2"
   }
 }

From 040162ab7012dcdfb68e510615afc5e32f06dd8d Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivo.murrell@ft.com>
Date: Wed, 2 Mar 2022 15:33:04 +0000
Subject: [PATCH 2/3] Check that both Node versions pass CI tests

---
 .github/settings.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index fd874d9..0ded432 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -6,7 +6,8 @@ branches:
       required_status_checks:
         strict: true
         contexts:
-          - 'ci/circleci: build'
+          - 'ci/circleci: build-v14.19'
+          - 'ci/circleci: build-v16.14'
       enforce_admins: true
       restrictions:
         users: []

From 68b53fe1d402a6ecce2858c6dc529c3b35b8113c Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivo.murrell@ft.com>
Date: Wed, 16 Mar 2022 17:32:50 +0000
Subject: [PATCH 3/3] Only run the publish job once

---
 .circleci/config.yml | 6 +-----
 .nvmrc               | 2 +-
 package.json         | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b06112..0688999 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -179,11 +179,7 @@ workflows:
           filters:
             <<: *filters_version_tag
           requires:
-            - test-v<< matrix.node-version >>
-          name: publish-v<< matrix.node-version >>
-          matrix:
-            parameters:
-              node-version: [ "16.14", "14.19" ]
+            - test-v16.14
 
   renovate-nori-build-test:
     jobs:
diff --git a/.nvmrc b/.nvmrc
index 48082f7..b6a7d89 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+16
diff --git a/package.json b/package.json
index 4d7dd45..ac52da7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     }
   },
   "volta": {
-    "node": "16.14.0",
+    "node": "16.14.1",
     "npm": "7.20.2"
   }
 }