From cfc0135e863d4623793b50deceffd30e705d7c0d Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 29 Apr 2021 10:48:26 +0100 Subject: [PATCH] Update ajv to 8.2.0 - drop support for JSON-Schema draft-04 --- package.json | 2 +- .../node_modules/@node-red/nodes/core/parsers/70-JSON.js | 3 +-- packages/node_modules/@node-red/nodes/package.json | 2 +- test/nodes/core/parsers/70-JSON_spec.js | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 573c76ee1..5cbf023a0 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ } ], "dependencies": { - "ajv": "6.12.6", + "ajv": "8.2.0", "async-mutex": "0.3.1", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js index c3bd6ae5b..a68edc681 100644 --- a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js +++ b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js @@ -17,8 +17,7 @@ module.exports = function(RED) { "use strict"; const Ajv = require('ajv'); - const ajv = new Ajv({allErrors: true, schemaId: 'auto'}); - ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json')); + const ajv = new Ajv({allErrors: true}); ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-06.json')); function JSONNode(n) { diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index c46d4f975..09f55387a 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -15,7 +15,7 @@ } ], "dependencies": { - "ajv": "6.12.6", + "ajv": "8.2.0", "body-parser": "1.19.0", "cheerio": "0.22.0", "content-type": "1.0.4", diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index 2ec3304bb..ad469bbd5 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/test/nodes/core/parsers/70-JSON_spec.js @@ -389,7 +389,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string"); + logEvents[0][0].msg.should.startWith("json.errors.schema-error"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -417,7 +417,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string"); + logEvents[0][0].msg.should.startWith("json.errors.schema-error"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -445,7 +445,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string"); + logEvents[0][0].msg.should.startWith("json.errors.schema-error"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -473,7 +473,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string"); + logEvents[0][0].msg.should.startWith("json.errors.schema-error"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) }