From e13edc787b49ce0e264bbd293880e876eb7fa175 Mon Sep 17 00:00:00 2001 From: Tim Heilman Date: Tue, 12 Dec 2023 13:51:39 -0800 Subject: [PATCH 1/2] fix: ajv-merge-patch issue 56 See https://github.com/ajv-validator/ajv-merge-patch/issues/56 --- keywords/add_keyword.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keywords/add_keyword.js b/keywords/add_keyword.js index 1811287..504de67 100644 --- a/keywords/add_keyword.js +++ b/keywords/add_keyword.js @@ -19,7 +19,7 @@ module.exports = function (ajv, keyword, jsonPatch, patchSchema) { : $ref; var validate = ajv.getSchema(id); if (validate) return validate.schema; - throw new ajv.constructor.MissingRefError(it.baseId, $ref); + throw new ajv.constructor.MissingRefError(ajv.opts.uriResolver, it.baseId, $ref); } }, metaSchema: { diff --git a/package.json b/package.json index b8327d9..71e580b 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "json-merge-patch": "^1.0.2" }, "devDependencies": { - "ajv": "^8.2.0", + "ajv": "^8.10.0", "coveralls": "^3.1.1", "eslint": "^7.8.1", "mocha": "^9.0.3", @@ -45,7 +45,7 @@ "pre-commit": "^1.1.3" }, "peerDependencies": { - "ajv": ">=8.0.0" + "ajv": ">=8.10.0" }, "nyc": { "exclude": [ From b797bb6bb884bb6244487ea8c784337f97bce8e3 Mon Sep 17 00:00:00 2001 From: Tim Heilman Date: Tue, 12 Dec 2023 14:06:26 -0800 Subject: [PATCH 2/2] chore: issue-56 be more lenient with the peerDependency because the only code with the newer dependency is test code, and having read up on peer dependencies, leniency is preferred: https://nodejs.org/en/blog/npm/peer-dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71e580b..57babdf 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "pre-commit": "^1.1.3" }, "peerDependencies": { - "ajv": ">=8.10.0" + "ajv": ">=8.0.0" }, "nyc": { "exclude": [