Skip to content

Commit 88944ed

Browse files
bors[bot]bidoubiwa
andauthored
Merge #272
272: Update ts-jest to 26.5.1 r=curquiza a=bidoubiwa to avoid merge conflict in #262 Co-authored-by: Charlotte Vermandel <[email protected]>
2 parents 988d29a + 26c5b80 commit 88944ed

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"rollup-plugin-terser": "^7.0.0",
102102
"rollup-plugin-typescript2": "^0.29.0",
103103
"shx": "^0.3.3",
104-
"ts-jest": "^26.4.4",
104+
"ts-jest": "^26.5.1",
105105
"typescript": "^4.1.5"
106106
}
107107
}

yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4871,7 +4871,7 @@ locate-path@^5.0.0:
48714871
dependencies:
48724872
p-locate "^4.1.0"
48734873

4874-
lodash.memoize@4.x, lodash.memoize@^4.1.2:
4874+
lodash.memoize@^4.1.2:
48754875
version "4.1.2"
48764876
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
48774877
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
@@ -4886,7 +4886,7 @@ lodash.uniq@^4.5.0:
48864886
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
48874887
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
48884888

4889-
lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4:
4889+
lodash@4.x, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4:
48904890
version "4.17.20"
48914891
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
48924892
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6888,18 +6888,18 @@ tr46@^2.0.2:
68886888
dependencies:
68896889
punycode "^2.1.1"
68906890

6891-
ts-jest@^26.4.4:
6892-
version "26.4.4"
6893-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49"
6894-
integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg==
6891+
ts-jest@^26.5.1:
6892+
version "26.5.1"
6893+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.1.tgz#4d53ee4481552f57c1624f0bd3425c8b17996150"
6894+
integrity sha512-G7Rmo3OJMvlqE79amJX8VJKDiRcd7/r61wh9fnvvG8cAjhA9edklGw/dCxRSQmfZ/z8NDums5srSVgwZos1qfg==
68956895
dependencies:
68966896
"@types/jest" "26.x"
68976897
bs-logger "0.x"
68986898
buffer-from "1.x"
68996899
fast-json-stable-stringify "2.x"
69006900
jest-util "^26.1.0"
69016901
json5 "2.x"
6902-
lodash.memoize "4.x"
6902+
lodash "4.x"
69036903
make-error "1.x"
69046904
mkdirp "1.x"
69056905
semver "7.x"

0 commit comments

Comments
 (0)