From 567644a7a6b3d61f7bee06d6af87d49137a2ea42 Mon Sep 17 00:00:00 2001
From: Nargonath <jonas.pauthier@gmail.com>
Date: Tue, 29 Sep 2020 13:38:55 +0200
Subject: [PATCH 1/5] Use travis shareable config

---
 .travis.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06984d8..aaf148c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1 @@
-language: node_js
-
-node_js:
-  - "8"
-  - "10"
-  - "12"
-  - "14"
-  - "node"
-
-after_script: "npm run coveralls"
+import: hapipal/ci-config-travis:node_js.yml@master

From a0c08e09c08e6472467f1732a99a4b73bf45aa9e Mon Sep 17 00:00:00 2001
From: Nargonath <jonas.pauthier@gmail.com>
Date: Fri, 9 Oct 2020 15:22:19 +0200
Subject: [PATCH 2/5] Add .vscode settings folder to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d5f19d8..dbc94a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 package-lock.json
+.vscode

From e179da9755956e845c235b981c665594d50105d2 Mon Sep 17 00:00:00 2001
From: Nargonath <jonas.pauthier@gmail.com>
Date: Fri, 9 Oct 2020 15:23:06 +0200
Subject: [PATCH 3/5] Update @hapi/topo to v5.x.x

---
 lib/index.js | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index a599758..be222f0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -9,7 +9,7 @@ exports.sort = (plugins, looseTally) => {
     plugins = [].concat(plugins || []);
     looseTally = looseTally || false;
 
-    const list = new Topo();
+    const list = new Topo.Sorter();
     const depsTally = {};
     const pluginTally = {};
 
diff --git a/package.json b/package.json
index 2842658..b0f9a46 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/hapipal/hodgepodge#readme",
   "dependencies": {
-    "@hapi/topo": "3.x.x"
+    "@hapi/topo": "5.x.x"
   },
   "peerDependencies": {
     "@hapi/hapi": ">=17 <21"

From be5cd96bf307e77517b3d3b1a60266b12844f6bc Mon Sep 17 00:00:00 2001
From: Nargonath <jonas.pauthier@gmail.com>
Date: Fri, 9 Oct 2020 15:26:44 +0200
Subject: [PATCH 4/5] Update @hapi/code to v8.x.x

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

diff --git a/package.json b/package.json
index b0f9a46..747ab9b 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "@hapi/hapi": ">=17 <21"
   },
   "devDependencies": {
-    "@hapi/code": "6.x.x",
+    "@hapi/code": "8.x.x",
     "@hapi/hapi": "18.x.x",
     "@hapi/hapi-20": "npm:@hapi/hapi@20",
     "@hapi/lab": "20.x.x",

From 3f955f563d21b58f2d4b677e2e550e5b5846c0c7 Mon Sep 17 00:00:00 2001
From: Nargonath <jonas.pauthier@gmail.com>
Date: Fri, 9 Oct 2020 15:30:09 +0200
Subject: [PATCH 5/5] Update @hapi/hapi to v20.x.x and use travis to test hapi
 versions

---
 .travis.yml   | 4 +++-
 package.json  | 6 ++----
 test/index.js | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aaf148c..0a2e2ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,3 @@
-import: hapipal/ci-config-travis:node_js.yml@master
+import:
+  - hapipal/ci-config-travis:hapi_all.yml@master
+  - hapipal/ci-config-travis:node_js.yml@master
diff --git a/package.json b/package.json
index 747ab9b..b8b75d9 100644
--- a/package.json
+++ b/package.json
@@ -33,14 +33,12 @@
     "@hapi/topo": "5.x.x"
   },
   "peerDependencies": {
-    "@hapi/hapi": ">=17 <21"
+    "@hapi/hapi": ">=19 <21"
   },
   "devDependencies": {
     "@hapi/code": "8.x.x",
-    "@hapi/hapi": "18.x.x",
-    "@hapi/hapi-20": "npm:@hapi/hapi@20",
+    "@hapi/hapi": "20.x.x",
     "@hapi/lab": "20.x.x",
-    "@hapi/somever": "2.x.x",
     "coveralls": "3.x.x"
   }
 }
diff --git a/test/index.js b/test/index.js
index 60fcc21..9bc531e 100644
--- a/test/index.js
+++ b/test/index.js
@@ -4,11 +4,9 @@
 
 const Lab = require('@hapi/lab');
 const Code = require('@hapi/code');
-const Somever = require('@hapi/somever');
+const Hapi = require('@hapi/hapi');
 const Hodgepodge = require('..');
 
-const Hapi = Somever.match(process.version, '>=12') ? require('@hapi/hapi-20') : require('@hapi/hapi');
-
 // Test shortcuts
 
 const { describe, it } = exports.lab = Lab.script();