Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/udamir/allof-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
udamir committed Aug 23, 2023
2 parents 28810b6 + d2858fb commit 60bd307
Show file tree
Hide file tree
Showing 4 changed files with 719 additions and 688 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Coveralls GitHub Action
# You may pin to the exact commit or the version.
# uses: coverallsapp/github-action@c7885c00cb7ec0b8f9f5ff3f53cddb980f7a4412
uses: coverallsapp/[email protected].0
uses: coverallsapp/[email protected].1
if: matrix.node == 16
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Merge schemas combined using allOf into a more readable composed schema free fro
- Supports $refs and circular references either (internal references only)
- Correctly merge of sibling content with $refs (optionally)
- Typescript syntax support out of the box
- No dependencies, can be used in nodejs or browser
- No dependencies (except json-crawl), can be used in nodejs or browser

## Works perfectly with specifications:

Expand Down Expand Up @@ -134,7 +134,7 @@ npm run benchmark
```

## Contributing
When contributing, keep in mind that it is an objective of `allof-merge` to have no package dependencies. This may change in the future, but for now, no-dependencies.
When contributing, keep in mind that it is an objective of `allof-merge` to have no additional package dependencies.

Please run the unit tests before submitting your PR: `npm test`. Hopefully your PR includes additional unit tests to illustrate your change/modification!

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"tslint": "^6.1.2",
"typescript": "^5.1.3",
"vite": "^4.3.9",
"vite-plugin-dts": "^2.3.0"
"vite-plugin-dts": "^3.0.3"
},
"jest": {
"transform": {
Expand Down
Loading

0 comments on commit 60bd307

Please sign in to comment.