Skip to content

Commit ca83dd1

Browse files
author
Jacquelyn Vinson
authored
Merge pull request #5 from majacQ/dependabot/npm_and_yarn/testing-library/jest-dom-5.12.0
chore(deps-dev): bump @testing-library/jest-dom from 5.11.9 to 5.12.0
2 parents a4ea9be + c76f108 commit ca83dd1

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

package.json

+5
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,13 @@
102102
"@nuxtjs/pwa": "^3.3.5",
103103
"@nuxtjs/robots": "^2.5.0",
104104
"@nuxtjs/sitemap": "^2.4.0",
105+
<<<<<<< dependabot/npm_and_yarn/testing-library/jest-dom-5.12.0
106+
"@testing-library/jest-dom": "^5.12.0",
107+
"@vue/test-utils": "^1.1.2",
108+
=======
105109
"@testing-library/jest-dom": "^5.11.9",
106110
"@vue/test-utils": "^1.1.4",
111+
>>>>>>> dev
107112
"autoprefixer": "^10.2.4",
108113
"babel-core": "^7.0.0-bridge.0",
109114
"babel-eslint": "^10.1.0",

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1599,10 +1599,10 @@
15991599
dependencies:
16001600
"@sinonjs/commons" "^1.7.0"
16011601

1602-
"@testing-library/jest-dom@^5.11.9":
1603-
version "5.11.9"
1604-
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz#e6b3cd687021f89f261bd53cbe367041fbd3e975"
1605-
integrity sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==
1602+
"@testing-library/jest-dom@^5.12.0":
1603+
version "5.12.0"
1604+
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz#6a5d340b092c44b7bce17a4791b47d9bc2c61443"
1605+
integrity sha512-N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow==
16061606
dependencies:
16071607
"@babel/runtime" "^7.9.2"
16081608
"@types/testing-library__jest-dom" "^5.9.1"

0 commit comments

Comments
 (0)