Skip to content

Commit cf9359e

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/testing-library/react-16.0.0
2 parents cbeb4c4 + edcf6b4 commit cf9359e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/dependabot-merge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Enable auto-merge for Dependabot PRs
19-
if: contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'
2019
run: gh pr merge --auto --merge "$PR_URL"
2120
env:
2221
PR_URL: ${{github.event.pull_request.html_url}}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"version": "1.8.0",
44
"private": true,
55
"dependencies": {
6-
"@testing-library/jest-dom": "^5.17.0",
6+
"@testing-library/jest-dom": "^6.5.0",
77
"@testing-library/react": "^16.0.0",
8-
"@testing-library/user-event": "^13.5.0",
8+
"@testing-library/user-event": "^14.5.2",
99
"ajv": "^8.17.1",
1010
"react": "^18.3.1",
1111
"react-circular-progressbar": "^2.1.0",
1212
"react-dom": "^18.3.1",
1313
"react-scripts": "5.0.1",
14-
"web-vitals": "^2.1.4"
14+
"web-vitals": "^4.2.3"
1515
},
1616
"prettier": {
1717
"singleQuote": true

0 commit comments

Comments
 (0)