Skip to content

Commit a882500

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/rollup-2.33.2
2 parents f1ccab4 + 8efaa94 commit a882500

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"@nuxtjs/pwa": "^3.2.2",
103103
"@nuxtjs/robots": "^2.4.2",
104104
"@nuxtjs/sitemap": "^2.4.0",
105-
"@testing-library/jest-dom": "^5.11.5",
105+
"@testing-library/jest-dom": "^5.11.6",
106106
"@vue/test-utils": "^1.1.1",
107107
"autoprefixer": "^10.0.2",
108108
"babel-core": "^7.0.0-bridge.0",
@@ -138,7 +138,7 @@
138138
"lint-staged": "^10.5.1",
139139
"loader-utils": "^2.0.0",
140140
"lodash": "^4.17.20",
141-
"marked": "^1.2.3",
141+
"marked": "^1.2.4",
142142
"nuxt": "^2.14.7",
143143
"postcss": "^8.1.7",
144144
"postcss-cli": "^8.2.0",

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,10 +1616,10 @@
16161616
dependencies:
16171617
"@sinonjs/commons" "^1.7.0"
16181618

1619-
"@testing-library/jest-dom@^5.11.5":
1620-
version "5.11.5"
1621-
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.5.tgz#44010f37f4b1e15f9d433963b515db0b05182fc8"
1622-
integrity sha512-XI+ClHR864i6p2kRCEyhvpVejuer+ObVUF4cjCvRSF88eOMIfqw7RoS9+qoRhyigGswMfT64L6Nt0Ufotxbwtg==
1619+
"@testing-library/jest-dom@^5.11.6":
1620+
version "5.11.6"
1621+
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz#782940e82e5cd17bc0a36f15156ba16f3570ac81"
1622+
integrity sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==
16231623
dependencies:
16241624
"@babel/runtime" "^7.9.2"
16251625
"@types/testing-library__jest-dom" "^5.9.1"
@@ -8979,10 +8979,10 @@ markdown-escapes@^1.0.0:
89798979
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
89808980
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
89818981

8982-
marked@^1.2.3:
8983-
version "1.2.3"
8984-
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.3.tgz#58817ba348a7c9398cb94d40d12e0d08df83af57"
8985-
integrity sha512-RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==
8982+
marked@^1.2.4:
8983+
version "1.2.4"
8984+
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.4.tgz#94e99230b03496c9383b1322ac51bc17dd388a1d"
8985+
integrity sha512-6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg==
89868986

89878987
md5.js@^1.3.4:
89888988
version "1.3.5"

0 commit comments

Comments
 (0)