Skip to content

Commit 6e5bd67

Browse files
committed
chore: upgrade deps
1 parent 12303f9 commit 6e5bd67

File tree

3 files changed

+225
-1166
lines changed

3 files changed

+225
-1166
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,7 @@ And connect via the debugger protocol.
272272

273273
Publishing is handled by a 2-branch [pre-release process](https://intuit.github.io/auto/docs/generated/shipit#next-branch-default), configured in `publish-auto.yml`. All changes should be based off the default `next` branch, and are published automatically.
274274

275-
- PRs made into the default branch are auto-deployed to the `next` pre-release tag on NPM. The result can be installed with `npm install ts-json-schema-generator@next`
276-
<<<<<<< HEAD
277-
- When merging into `next`, please use the `squash and merge` strategy.
278-
- To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/ts-json-schema-generator/compare/stable...next).
279-
- When merging from `next` into `stable`, please use the `create a merge commit` strategy.
280-
=======
281-
- To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/ts-json-schema-generator/compare/stable...next).
282-
>>>>>>> stable
275+
- PRs made into the default branch are auto-deployed to the `next` pre-release tag on NPM. The result can be installed with `npm install ts-json-schema-generator@next`
276+
- When merging into `next`, please use the `squash and merge` strategy.
277+
- To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/ts-json-schema-generator/compare/stable...next).
278+
- When merging from `next` into `stable`, please use the `create a merge commit` strategy.

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,36 +47,36 @@
4747
"@types/json-schema": "^7.0.9",
4848
"commander": "^8.2.0",
4949
"fast-json-stable-stringify": "^2.1.0",
50-
"glob": "^7.1.7",
50+
"glob": "^7.2.0",
5151
"json-stable-stringify": "^1.0.1",
5252
"json5": "^2.2.0",
5353
"typescript": "~4.4.3"
5454
},
5555
"devDependencies": {
56-
"@auto-it/conventional-commits": "^10.32.0",
57-
"@auto-it/first-time-contributor": "^10.32.0",
56+
"@auto-it/conventional-commits": "^10.32.1",
57+
"@auto-it/first-time-contributor": "^10.32.1",
5858
"@babel/core": "^7.15.5",
5959
"@babel/preset-env": "^7.15.6",
6060
"@babel/preset-typescript": "^7.15.0",
6161
"@types/glob": "^7.1.4",
62-
"@types/jest": "^27.0.1",
62+
"@types/jest": "^27.0.2",
6363
"@types/json-stable-stringify": "^1.0.33",
64-
"@types/node": "^16.9.4",
65-
"@typescript-eslint/eslint-plugin": "^4.31.1",
66-
"@typescript-eslint/parser": "^4.31.1",
64+
"@types/node": "^16.10.2",
65+
"@typescript-eslint/eslint-plugin": "^4.33.0",
66+
"@typescript-eslint/parser": "^4.33.0",
6767
"ajv": "^8.6.3",
6868
"ajv-formats": "^2.1.1",
69-
"auto": "^10.32.0",
69+
"auto": "^10.32.1",
7070
"chai": "^4.3.4",
7171
"cross-env": "^7.0.3",
7272
"eslint": "^7.32.0",
7373
"eslint-config-prettier": "^8.3.0",
7474
"eslint-plugin-prettier": "^4.0.0",
75-
"jest": "^27.2.0",
76-
"jest-junit": "^12.2.0",
75+
"jest": "^27.2.4",
76+
"jest-junit": "^13.0.0",
7777
"prettier": "^2.4.1",
7878
"ts-node": "^10.2.1",
79-
"vega": "^5.20.2",
79+
"vega": "^5.21.0",
8080
"vega-lite": "^5.1.1"
8181
},
8282
"scripts": {

0 commit comments

Comments
 (0)