Skip to content

Commit

Permalink
Merge 3f955f5 into 60d37d4
Browse files Browse the repository at this point in the history
  • Loading branch information
Nargonath committed Oct 9, 2020
2 parents 60d37d4 + 3f955f5 commit 1bcb93d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,2 +1,3 @@
node_modules
package-lock.json
.vscode
13 changes: 3 additions & 10 deletions .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
2 changes: 1 addition & 1 deletion lib/index.js
Expand Up @@ -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 = {};

Expand Down
10 changes: 4 additions & 6 deletions package.json
Expand Up @@ -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"
}
}
4 changes: 1 addition & 3 deletions test/index.js
Expand Up @@ -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();
Expand Down

0 comments on commit 1bcb93d

Please sign in to comment.