Skip to content

Commit 467812a

Browse files
committed
fix(deps): use released json-schema-merge-allof
1 parent 343fcce commit 467812a

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@stoplight/react-error-boundary": "^1.0.0",
4848
"@stoplight/tree-list": "5.0.0-beta.2",
4949
"classnames": "^2.2.6",
50-
"json-schema-merge-allof": "https://github.com/stoplightio/json-schema-merge-allof",
50+
"@stoplight/json-schema-merge-allof": "^0.6.0",
5151
"lodash": "^4.17.15",
5252
"mobx-react-lite": "^1.4.1",
5353
"pluralize": "^8.0.0"

src/utils/mergeAllOf.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { JSONSchema4 } from 'json-schema';
22
// @ts-ignore
3-
import resolveAllOf from 'json-schema-merge-allof';
3+
import resolveAllOf from '@stoplight/json-schema-merge-allof';
44
import { cloneDeep } from 'lodash';
55

66
export const mergeAllOf = (schema: JSONSchema4) => {

yarn.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,6 +1557,15 @@
15571557
lodash "^4.17.4"
15581558
read-pkg-up "^7.0.0"
15591559

1560+
"@stoplight/json-schema-merge-allof@^0.6.0":
1561+
version "0.6.0"
1562+
resolved "https://registry.yarnpkg.com/@stoplight/json-schema-merge-allof/-/json-schema-merge-allof-0.6.0.tgz#c4556c925796df45f8b3a83ed94cf9f99e4bc414"
1563+
integrity sha512-xQnQZa37Z6bHlf6xv1mcPxg73tHUBPORlSIgs1znYLg6VD7tSAnWAyskvi+tBUXi/zsZYsU1gwPQkmFBORldNA==
1564+
dependencies:
1565+
compute-lcm "^1.1.0"
1566+
json-schema-compare "^0.2.2"
1567+
lodash "^4.17.4"
1568+
15601569
"@stoplight/json@^3.0", "@stoplight/json@^3.5.1":
15611570
version "3.5.1"
15621571
resolved "https://registry.yarnpkg.com/@stoplight/json/-/json-3.5.1.tgz#afc6ffcbe2ada8f9b16680fd7885688cf9beec7e"
@@ -8703,14 +8712,6 @@ json-schema-compare@^0.2.2:
87038712
dependencies:
87048713
lodash "^4.17.4"
87058714

8706-
"json-schema-merge-allof@https://github.com/stoplightio/json-schema-merge-allof":
8707-
version "0.6.0"
8708-
resolved "https://github.com/stoplightio/json-schema-merge-allof#bb02f48aba949226a8eafbbb03f850afcb7d203e"
8709-
dependencies:
8710-
compute-lcm "^1.1.0"
8711-
json-schema-compare "^0.2.2"
8712-
lodash "^4.17.4"
8713-
87148715
json-schema-traverse@^0.4.1:
87158716
version "0.4.1"
87168717
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"

0 commit comments

Comments
 (0)