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

Commit

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

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.6 to 7.0.3.
<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.3</h2>
<p>Fixes:</p>
<ul>
<li>oneOf error type (<a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1368">#1368</a>, <a href="https://github.com/G-Rath">@G-Rath</a>)</li>
<li>remove multiple imports (rollup/plugins#745)</li>
</ul>
<p>Docs:</p>
<ul>
<li>Using in ES5 (<a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1364">#1364</a>, <a href="https://github.com/aladdin-add">@aladdin-add</a>)</li>
<li>Option strictTypes: false has to be used with json-schema-secure schema (<a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1373">#1373</a>)</li>
</ul>
<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/master/docs/json-schema.md#unevaluatedproperties"><code>unevaluatedProperties</code></a> and <a href="https://github.com/ajv-validator/ajv/blob/master/docs/json-schema.md#unevaluateditems"><code>unevaluatedItems</code></a>, <a href="https://github.com/ajv-validator/ajv/blob/master/docs/validation.md#extending-recursive-schemas">dynamic recursive references</a> and other <a href="https://github.com/ajv-validator/ajv/blob/master/docs/json-schema.md#json-schema-draft-2019-09">additional keywords</a>.</li>
<li>comprehensive support for <a href="https://github.com/ajv-validator/ajv/blob/master/docs/standalone.md">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>
<li>order of schema keyword validation changed - keywords that apply to all types (allOf etc.) are now validated first, before the keywords that apply to specific data types. You can still define custom keywords that apply to all types AND are validated after type-specific keywords using option <code>post: true</code> in keyword definition.</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>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/ajv-validator/ajv/commit/ca2ae61c489f45fa2ec3ff2ee78b10136cb1ed3c"><code>ca2ae61</code></a> 7.0.3</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/78cc974351034e1b39e7864fcf0f844f0e3cb309"><code>78cc974</code></a> Merge branch 'hello-weiran-issue1364'</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/c44597e3e19f711c1892eea04807ca0c67b11d95"><code>c44597e</code></a> docs: move &quot;using in ES5 env&quot; to readme</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/d0b1368559d634339c6f1fe87be471c322b84f74"><code>d0b1368</code></a> Merge branch 'issue1364' of <a href="https://github.com/hello-weiran/ajv">https://github.com/hello-weiran/ajv</a> into hello-we...</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/9200e928c8927bf6c626d5f9488b6e9ca7e6171d"><code>9200e92</code></a> docs: add option to the example using json-schema-secure schema (<a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1373">#1373</a>)</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/4de9bfb53397d2d2c3d8e3fc38b6237dcac40c2b"><code>4de9bfb</code></a> remove duplicate import (rollup/plugins#745)</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/97bfa50862cfcaf8fe998507c45dcb8bf4adcb88"><code>97bfa50</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1370">#1370</a> from caub/patch-1</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/71ef1e09d3d5065d1da2e03a06f1bc18dff6f652"><code>71ef1e0</code></a> fix range example typos</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/342b84dbe6b4d02eceea22592294238ff1e56fe9"><code>342b84d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ajv-validator/ajv/issues/1368">#1368</a> from G-Rath/patch-2</li>
<li><a href="https://github.com/ajv-validator/ajv/commit/9121a870ebfa3bb6b1d072cc91b4cd2c22b817ef"><code>9121a87</code></a> fix: add <code>| null</code> to <code>OneOfError</code> param property</li>
<li>Additional commits viewable in <a href="https://github.com/ajv-validator/ajv/compare/v6.12.6...v7.0.3">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.3)](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 Jan 3, 2021
2 parents 268caa5 + 146d103 commit 0f1e2ed
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.3",
"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.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
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 @@ -4697,6 +4712,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 0f1e2ed

Please sign in to comment.