From e9689dc21d9d2d6c1317071f80ed71b87771545c Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Wed, 6 Jan 2021 12:18:46 -0800
Subject: [PATCH] drop node 10 support (#2890)

---
 .github/workflows/ci-test-win.yml | 13 +++++++------
 .github/workflows/ci-test.yml     |  8 ++++----
 .gitignore                        |  3 ++-
 Changes.md                        | 12 ++++++++++++
 package.json                      |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci-test-win.yml b/.github/workflows/ci-test-win.yml
index a98ef6726c..c305b87172 100644
--- a/.github/workflows/ci-test-win.yml
+++ b/.github/workflows/ci-test-win.yml
@@ -14,11 +14,11 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest ]
-        node-version: [10.x, 12.x, 13.x]
+        node-version: [12.x, 14.x]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       name: Checkout Haraka
       with:
         fetch-depth: 1
@@ -28,10 +28,11 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: npm install and test
-      run: |
-        npm install
-        npm run test
+    - name: Install
+      run: npm install
+
+    - name: Test
+      run: npm run test
 
       env:
         CI: true
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 37db78dcc5..a0e5ea007c 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -18,11 +18,11 @@ jobs:
         # node 6, maint. ended 2018-04
         # node 8, maint. ended 2019-12
         # node 10, maint. ends 2021-04
-        node-version: [10.x, 12.x, 13.x]
+        node-version: [12.x, 14.x]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       name: Checkout Haraka
       with:
         fetch-depth: 1
@@ -32,10 +32,10 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: npm install
+    - name: Install
       run: npm install
 
-    - name: Run test suite
+    - name: Test
       run: npm run test
 
       env:
diff --git a/.gitignore b/.gitignore
index bff53630d2..8d1a907c6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-!tests/node_modules
 .coveralls.yml
 Haraka-*.gz
 *~
@@ -7,6 +6,8 @@ bower_components
 coverage
 .nyc_output
 .idea
+tests/node_modules
 tests/queue/plain
 tests/queue/multibyte
+tests/test-queue
 package-lock.json
diff --git a/Changes.md b/Changes.md
index 38bfb1ce4f..3da7050415 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,6 +1,18 @@
 
 ## NEXT - 2020-MM-DD
 
+### Changes
+
+- use address-rfc2821 2.0.0
+- drop support for node 10
+
+### New features
+
+- 
+
+### Fixes
+
+- 
 
 ## 2.8.27 - 2021-01-05
 
diff --git a/package.json b/package.json
index 97ce791821..32459e0381 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,10 @@
   },
   "main": "haraka.js",
   "engines": {
-    "node": ">= v10.23.1"
+    "node": ">=12.20.1"
   },
   "dependencies": {
-    "address-rfc2821"       : "^1.2.3",
+    "address-rfc2821"       : "^2.0.0",
     "address-rfc2822"       : "^2.0.5",
     "async"                 : "~3.2.0",
     "daemon"                : "~1.1.0",