Skip to content

Commit 25d8e0d

Browse files
committed
fix: merge
2 parents b4db8d0 + d3c0e96 commit 25d8e0d

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

example/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2696,7 +2696,7 @@ babel-extract-comments@^1.0.0:
26962696
dependencies:
26972697
babylon "^6.18.0"
26982698

2699-
babel-jest@^26.6.0, babel-jest@^26.6.3:
2699+
babel-jest@26.6.3, babel-jest@^26.6.0, babel-jest@^26.6.3:
27002700
version "26.6.3"
27012701
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
27022702
integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
"prettier": "2.3.2",
6868
"react": "^17.0.2",
6969
"react-dom": "^17.0.2",
70-
"rimraf": "^3.0.2",
71-
"testing-library__dom": "^7.29.4-beta.1",
72-
"ts-jest": "^26",
73-
"ts-node": "^10.2.0",
74-
"typescript": "^4.3.5"
70+
"rimraf": "3.0.2",
71+
"testing-library__dom": "7.29.4-beta.1",
72+
"ts-jest": "26.5.6",
73+
"ts-node": "10.2.1",
74+
"typescript": "4.3.5"
7575
},
7676
"publishConfig": {
7777
"registry": "https://registry.npmjs.org"

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": ["config:base", ":automergePatch"]
2+
"extends": ["config:base"]
33
}

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5599,7 +5599,7 @@ reusify@^1.0.4:
55995599
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
56005600
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
56015601

5602-
rimraf@^3.0.0, rimraf@^3.0.2:
5602+
rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
56035603
version "3.0.2"
56045604
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
56055605
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -6110,7 +6110,7 @@ test-exclude@^6.0.0:
61106110
glob "^7.1.4"
61116111
minimatch "^3.0.4"
61126112

6113-
testing-library__dom@^7.29.4-beta.1:
6113+
61146114
version "7.29.4-beta.1"
61156115
resolved "https://registry.yarnpkg.com/testing-library__dom/-/testing-library__dom-7.29.4-beta.1.tgz#dc755f485837e923efbe12c1b7ae43b0ed326f96"
61166116
integrity sha512-vb/SMg8rXYcYYFY2eQ2n2a0p2VWNAseM4WHLfsckIyLwxRz5fYqKysUzUYpAX8SwRfruRK+tZqLuL4ND+D1s7Q==
@@ -6210,7 +6210,7 @@ trim-newlines@^3.0.0:
62106210
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
62116211
integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
62126212

6213-
ts-jest@^26:
6213+
ts-jest@26.5.6:
62146214
version "26.5.6"
62156215
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35"
62166216
integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==
@@ -6226,7 +6226,7 @@ ts-jest@^26:
62266226
semver "7.x"
62276227
yargs-parser "20.x"
62286228

6229-
ts-node@^10.2.0:
6229+
62306230
version "10.2.1"
62316231
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
62326232
integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
@@ -6315,7 +6315,7 @@ typedarray-to-buffer@^3.1.5:
63156315
dependencies:
63166316
is-typedarray "^1.0.0"
63176317

6318-
typescript@^4.3.5:
6318+
63196319
version "4.3.5"
63206320
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
63216321
integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==

0 commit comments

Comments
 (0)