diff --git a/.gitignore b/.gitignore index d5f19d8..dbc94a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules package-lock.json +.vscode diff --git a/.travis.yml b/.travis.yml index 06984d8..0a2e2ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,3 @@ -language: node_js - -node_js: - - "8" - - "10" - - "12" - - "14" - - "node" - -after_script: "npm run coveralls" +import: + - hapipal/ci-config-travis:hapi_all.yml@master + - hapipal/ci-config-travis:node_js.yml@master 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..b8b75d9 100644 --- a/package.json +++ b/package.json @@ -30,17 +30,15 @@ }, "homepage": "https://github.com/hapipal/hodgepodge#readme", "dependencies": { - "@hapi/topo": "3.x.x" + "@hapi/topo": "5.x.x" }, "peerDependencies": { - "@hapi/hapi": ">=17 <21" + "@hapi/hapi": ">=19 <21" }, "devDependencies": { - "@hapi/code": "6.x.x", - "@hapi/hapi": "18.x.x", - "@hapi/hapi-20": "npm:@hapi/hapi@20", + "@hapi/code": "8.x.x", + "@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();