diff --git a/package.json b/package.json index 7bc882decc29..45da5bb3b176 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "@types/jasmine": "^3.6.0", "@types/luxon": "^1.27.0", "@types/marked": "^2.0.0", - "@types/merge2": "^0.3.30", + "@types/merge2": "^1.3.1", "@types/minimist": "^1.2.0", "@types/node": "^14.14.22", "@types/node-fetch": "^2.5.5", diff --git a/yarn.lock b/yarn.lock index a1f86406f349..9d30d8dd83bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2096,10 +2096,10 @@ dependencies: "@types/unist" "*" -"@types/merge2@^0.3.30": - version "0.3.30" - resolved "https://registry.yarnpkg.com/@types/merge2/-/merge2-0.3.30.tgz#9e39d04f6fe4f36fa7477566cad1faf80b2a671f" - integrity sha1-njnQT2/k82+nR3VmytH6+AsqZx8= +"@types/merge2@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@types/merge2/-/merge2-1.3.1.tgz#e7c0b9d583581328e780a55cc847997f3f092686" + integrity sha512-aDA8WfZHU/J1OeQmrP+DfGrl1tb0cwNIuiiIqK3+S21gQ+aWg2n4OIvmFHpd2A4yQdZfjikC4XIYVNtX+b9qgg== dependencies: "@types/node" "*" @@ -2148,12 +2148,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== -"@types/node@^14.14.22": - version "14.17.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz#cc61c8361c89e70c468cda464d1fa3dd7e5ebd62" - integrity sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ== - -"@types/node@^14.17.0": +"@types/node@^14.14.22", "@types/node@^14.17.0": version "14.17.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz#b97c057e6138adb7b720df2bd0264b03c9f504fd" integrity sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==