Skip to content

Commit

Permalink
Update AJV to version 6 (#109)
Browse files Browse the repository at this point in the history
Fixes, #107, closes #105
  • Loading branch information
realityking authored and Ahmad Nassri committed Nov 7, 2018
1 parent e0fee11 commit 759bffe
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 22 deletions.
15 changes: 11 additions & 4 deletions lib/async.js
Expand Up @@ -4,14 +4,21 @@ var schemas = require('har-schema')

var ajv

function createAjvInstance () {
var ajv = new Ajv({
allErrors: true
})
ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-06.json'))
ajv.addSchema(schemas)

return ajv
}

function validate (name, data, next) {
data = data || {}

// validator config
ajv = ajv || new Ajv({
allErrors: true,
schemas: schemas
})
ajv = ajv || createAjvInstance()

var validate = ajv.getSchema(name + '.json')

Expand Down
15 changes: 11 additions & 4 deletions lib/promise.js
Expand Up @@ -4,14 +4,21 @@ var schemas = require('har-schema')

var ajv

function createAjvInstance () {
var ajv = new Ajv({
allErrors: true
})
ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-06.json'))
ajv.addSchema(schemas)

return ajv
}

function validate (name, data) {
data = data || {}

// validator config
ajv = ajv || new Ajv({
allErrors: true,
schemas: schemas
})
ajv = ajv || createAjvInstance()

var validate = ajv.getSchema(name + '.json')

Expand Down
42 changes: 29 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -40,7 +40,7 @@
"tap": "^12.0.0"
},
"dependencies": {
"ajv": "^5.3.0",
"ajv": "^6.5.2",
"har-schema": "^2.0.0"
}
}

1 comment on commit 759bffe

@patsjo
Copy link

@patsjo patsjo commented on 759bffe Nov 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When changing ajv from 5.3.0 to 6.5.2, you should also change the major version of this. Because of this you have broken uglifyjs, since the request package had a dependency on ~5.1.0.

Please sign in to comment.