Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

Commit

Permalink
Merge #3437
Browse files Browse the repository at this point in the history
3437: Bump ajv from 6.12.6 to 7.0.2 in /tests r=mergify[bot] a=dependabot[bot]

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.6 to 7.0.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/ajv-validator/ajv/releases">ajv's releases</a>.</em></p>
<blockquote>
<h2>v7.0.2</h2>
<p>Remove duplicate functions from standalone validation code (<a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1361">#1361</a>)</p>
<h2>v7.0.1</h2>
<p>Update error message for <code>maxLength</code>/<code>minLength</code> keywords</p>
<h2>v7.0.0</h2>
<p>Please note: this document covers the changes from v6.12.6.</p>
<h1>The main changes</h1>
<ul>
<li>support of JSON Schema draft-2019-09 features: <a href="https://github.com/ajv-validator/ajv/blob/HEAD/json-schema.md#unevaluatedproperties"><code>unevaluatedProperties</code></a> and <a href="https://github.com/ajv-validator/ajv/blob/HEAD/json-schema.md#unevaluateditems"><code>unevaluatedItems</code></a>, <a href="https://github.com/ajv-validator/ajv/blob/HEAD/validation.md#extending-recursive-schemas">dynamic recursive references</a> and other <a href="https://github.com/ajv-validator/ajv/blob/HEAD/json-schema.md#json-schema-draft-2019-09">additional keywords</a>.</li>
<li>comprehensive support for <a href="">standalone validation code</a> - compiling one or multiple schemas to standalone modules with one or multiple exports.</li>
<li>to reduce the mistakes in JSON schemas and unexpected validation results, <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/strict-mode.md">strict mode</a> is added - it prohibits ignored or ambiguous JSON Schema elements. See <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/strict-mode.md">Strict mode</a> and <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/api.md">Options</a> for more details</li>
<li>to make code injection from untrusted schemas impossible, <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/codegen.md">code generation</a> is fully re-written to be type-level safe against code injection.</li>
<li>to simplify Ajv extensions, the new keyword API that is used by pre-defined keywords is available to user-defined keywords - it is much easier to define any keywords now, especially with subschemas.</li>
<li>schemas are compiled to ES6 code (ES5 code generation is supported with an option).</li>
<li>to improve reliability and maintainability the code is migrated to TypeScript.</li>
<li>separate Ajv classes from draft-07 and draft-2019-09 support with different default imports (see <a href="https://github.com/ajv-validator/ajv#usage">Getting started</a> or <a href="https://github.com/ajv-validator/ajv/releases/tag/v7.0.0-beta.5">v7.0.0-beta.5</a> for the details).</li>
</ul>
<p><strong>Please note</strong>:</p>
<ul>
<li>the support for JSON-Schema draft-04 is removed - if you have schemas using &quot;id&quot; attributes you have to replace them with &quot;$id&quot; (or continue using version 6 that will be supported until 02/28/2021).</li>
<li>all formats are separated to <a href="https://github.com/ajv-validator/ajv-formats">ajv-formats</a> package - they have to be explicitly added if you use them.</li>
<li>Ajv instance can only be created with <code>new</code> keyword, as Ajv is now ES6 class.</li>
<li>browser bundles are automatically published to ajv-dist package (but still available on cdnjs.com).</li>
</ul>
<h2>Better TypeScript support:</h2>
<ul>
<li>Methods <code>compile</code> and <code>compileAsync</code> now return type-guards - see <a href="https://github.com/ajv-validator/ajv/tree/v7-beta#usage">Getting started</a>.</li>
<li>Method <code>validate</code> is a type-guard.</li>
<li>Better separation of asynchronous schemas on type level.</li>
<li>Type utility JSONSchemaType<!-- raw HTML omitted --> that generates the type for JSON Schema for type interface in the type parameter - it simplifies writing schemas (no unions support at the moment).</li>
</ul>
<h2>API changes:</h2>
<ul>
<li>addVocabulary - NEW method that allows to add an array of keyword definitions.</li>
<li>addKeyword - keyword name should be passed as property in definition object, not as the first parameter (old API works with &quot;deprecated&quot; warning). Also &quot;inline&quot; keywords support is removed, code generation keywords can now be defined with &quot;code&quot; keyword - the same definition format that is used by all pre-defined keywords</li>
<li>Ajv no longer allows to create the instance without <code>new</code> keyword (it is ES6 class).</li>
</ul>
<h3>Added options (and defaults):</h3>
<ul>
<li>strict: true - strict mode</li>
<li>strictTypes: &quot;log&quot; - prevent mistakes related to type keywords and keyword applicability (see <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/strict-mode.md#strict-types">Strict Types</a>)</li>
<li>strictTuples: &quot;log&quot; - prevent incomplete tuple schemas (see <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/strict-mode.md#prohibit-unconstrained-tuples">Prohibit unconstrained tuples</a>)</li>
<li>allowUnionTypes: false - allow multiple non-null types in &quot;type&quot; keyword</li>
<li>allowMatchingProperties: false - allow overlap between &quot;properties&quot; and &quot;patternProperties&quot; keywords</li>
<li>loopEnum: Infinity - optimise validation of enums, similar to <code>loopRequired</code></li>
<li>validateFormats: true - enable format validation</li>
<li>code: {optimize: number|boolean} - control <a href="https://github.com/ajv-validator/ajv/blob/v7-beta/docs/codegen.md#code-optimization">code optimisation</a></li>
<li>code: {es5: true} - generate ES5 code, the default is to generate ES6 code.</li>
<li>code: {lines: true} - add line breaks to generated code - simplifies debugging of compiled schemas when you need it</li>
</ul>
<h3>Changed options:</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/ajv-validator/ajv/commit/5c28d853673948c86ab3d876a31c14dae9d63d32"><code>5c28d85</code></a> 7.0.2</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/832fee18d39dd1e7c3db4766c029474b81530db9"><code>832fee1</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1362">#1362</a> from ajv-validator/fix-standalone</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/0b89a00fc36d9e618c79b464bf4efff08cc26eb9"><code>0b89a00</code></a> fix: standalone code generation creating duplicate functions (closes <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1361">#1361</a>)</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/eae2d5d47426e8b4c355e6613fcf2c3f5e61eec2"><code>eae2d5d</code></a> test: failing test for standalone code (duplicate functions, <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1361">#1361</a>)</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/e446893f5bc1711fa782839eb760ca2c04c1cbfe"><code>e446893</code></a> test: duplicate function in standalone code, it should fail but it does not (...</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/5fe4bc04dda46ff289b58b6192cfecc0fece728c"><code>5fe4bc0</code></a> ci: only update website on push to master (not on PR), closes <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1358">#1358</a></li>
<li><a href="https://github.com/ajv-validator/ajv/commit/bd9578377bc22f327a491a2df0833f0f15d8118a"><code>bd95783</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1355">#1355</a> from orgads/readme-links</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/53022710b1b8d121600e40da1f491b50e94a9d43"><code>5302271</code></a> README: Fix broken links</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/616a725993d6d271ada3845f8b050ac226f3a217"><code>616a725</code></a> 7.0.1</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/dc55ff2a7e138ff69b84e2c52f1bffdcee984075"><code>dc55ff2</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1353">#1353</a> from nicksrandall/patch-1</li>
<li>Additional commits viewable in <a href="https://github.com/ajv-validator/ajv/compare/v6.12.6...v7.0.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ajv&package-manager=npm_and_yarn&previous-version=6.12.6&new-version=7.0.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] authored Dec 22, 2020
2 parents 663978e + ab94ace commit d224403
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/tail": "^2.0.0",
"@types/tmp": "^0.2.0",
"@types/urijs": "^1.19.13",
"ajv": "^6.12.6",
"ajv": "^7.0.2",
"axios": "^0.21.1",
"bitcoin-core": "^3.0.0",
"bitcoinjs-lib": "^5.2.0",
Expand Down
22 changes: 21 additions & 1 deletion tests/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=

ajv@^6.12.3, ajv@^6.12.6:
ajv@^6.12.3:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
Expand All @@ -1144,6 +1144,16 @@ ajv@^6.12.3, ajv@^6.12.6:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"

ajv@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.2.tgz#04ccc89a93449c64382fe0846d45a7135d986dbc"
integrity sha512-qIaxO9RXjaXyO21tJr0EvwPcZa49m64GcXCU8ZrLjCAlFyMuOcPpI560So4A11M1WsKslJYIXn6jSyG5P0xIeg==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
require-from-string "^2.0.2"
uri-js "^4.2.2"

ansi-escapes@^4.2.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
Expand Down Expand Up @@ -3712,6 +3722,11 @@ json-schema-traverse@^0.4.1:
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==

json-schema-traverse@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==

[email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
Expand Down Expand Up @@ -4690,6 +4705,11 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=

require-from-string@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==

require-main-filename@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
Expand Down

0 comments on commit d224403

Please sign in to comment.