Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

Commit

Permalink
Merge #3534
Browse files Browse the repository at this point in the history 
3534: Bump ts-jest from 26.5.2 to 26.5.4 in /tests r=mergify[bot] a=dependabot[bot]

Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 26.5.2 to 26.5.4.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md">ts-jest's changelog</a>.</em></p>
<blockquote>
<h2><a href="https://github.com/kulshekhar/ts-jest/compare/v26.5.3...v26.5.4">26.5.4</a> (2021-03-17)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>compiler:</strong> initialize compiler with <code>.ts</code>/<code>.tsx</code>/<code>.d.ts</code> files only (<a href="https://github.com/kulshekhar/ts-jest/issues/2457">#2457</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/1dc731a5faf7cda59db1cc642eb99fae973b1246">1dc731a</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2445">#2445</a></li>
</ul>
<h1><a href="https://github.com/kulshekhar/ts-jest/compare/v27.0.0-next.7...v27.0.0-next.8">27.0.0-next.8</a> (2021-03-11)</h1>
<h3>Bug Fixes</h3>
<ul>
<li><strong>compiler:</strong> resolve nested imported modules for each processing file (<a href="https://github.com/kulshekhar/ts-jest/issues/2436">#2436</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/3cb9019289bb64deecffaf52e840faf6a4656092">3cb9019</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/1390">#1390</a> <a href="https://github.com/kulshekhar/ts-jest/issues/1747">#1747</a></li>
<li><strong>config:</strong> create fallback jest config when jest config is <code>undefined</code> (<a href="https://github.com/kulshekhar/ts-jest/issues/2433">#2433</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/c6d6e4cd534e1c368fcb7141784ee43584525ca4">c6d6e4c</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2085">#2085</a></li>
<li>remove <code>@types/jest</code> from direct dep (<a href="https://github.com/kulshekhar/ts-jest/issues/2409">#2409</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/89131203c358c8f9e89655800e500a9e88a17334">8913120</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2406">#2406</a> <a href="https://github.com/kulshekhar/ts-jest/issues/2411">#2411</a></li>
<li><strong>compiler:</strong> return original file content and show warning on emit skip (<a href="https://github.com/kulshekhar/ts-jest/issues/2410">#2410</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/c2b2164ddd1e606fc2490326244a6efc63f6c4a0">c2b2164</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2407">#2407</a></li>
<li><strong>compiler:</strong> type check correctly in watch mode when a file content itself has changed (<a href="https://github.com/kulshekhar/ts-jest/issues/2405">#2405</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/064bf3a73e9a304aa9366d27db8973b68be23ffd">064bf3a</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2118">#2118</a></li>
</ul>
<h3>Features</h3>
<ul>
<li>adopt jest <strong>27.0.0-next.4</strong> (<a href="https://github.com/kulshekhar/ts-jest/issues/2435">#2435</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/1d411f285e4f7eff7982c3917b6b91b5af617e8a">1d411f2</a>)</li>
</ul>
<h2><a href="https://github.com/kulshekhar/ts-jest/compare/v26.5.2...v26.5.3">26.5.3</a> (2021-03-03)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>config:</strong> create fallback jest config when jest config is undefined (<a href="https://github.com/kulshekhar/ts-jest/issues/2421">#2421</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/0fb6b45e7dc3dd7588d27f09ac9a8849dff470cb">0fb6b45</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2085">#2085</a></li>
<li>remove <code>@types/jest</code> from direct dep (<a href="https://github.com/kulshekhar/ts-jest/issues/2416">#2416</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/060302ed1eb8708df0acd7ab1d613ff06fc08cf3">060302e</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2406">#2406</a> <a href="https://github.com/kulshekhar/ts-jest/issues/2411">#2411</a></li>
<li><strong>compiler:</strong> return original file content on emit skip (<a href="https://github.com/kulshekhar/ts-jest/issues/2408">#2408</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/cfba8f423dd59536d8b1e1374ef2b20bff2ed857">cfba8f4</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2407">#2407</a></li>
</ul>
<h1><a href="https://github.com/kulshekhar/ts-jest/compare/v27.0.0-next.6...v27.0.0-next.7">27.0.0-next.7</a> (2021-02-24)</h1>
<h3>Bug Fixes</h3>
<ul>
<li><strong>compiler:</strong> exclude files in <code>outDir</code> from compiler source files (<a href="https://github.com/kulshekhar/ts-jest/issues/2375">#2375</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/ec68c74bccf56d682a7ed9e5c48ea676dcf3fbf9">ec68c74</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2350">#2350</a> <a href="https://github.com/kulshekhar/ts-jest/issues/2374">#2374</a></li>
<li><strong>config:</strong> cache config and compiler correctly between runs (<a href="https://github.com/kulshekhar/ts-jest/issues/2356">#2356</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/5f91336b9023da1051cc85b509ad02c525679fcb">5f91336</a>)</li>
<li><strong>config:</strong> improve emit skipped error message (<a href="https://github.com/kulshekhar/ts-jest/issues/2358">#2358</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/2ae8df4515d6f6e975e57719a89184b5583f9e2f">2ae8df4</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2350">#2350</a></li>
<li><strong>typings:</strong> set correct typing for <code>tsconfig</code> option (<a href="https://github.com/kulshekhar/ts-jest/issues/2383">#2383</a>) (<a href="https://github.com/kulshekhar/ts-jest/commit/584324a60c0784275e9bf8bcfd0814735a250d24">584324a</a>), closes <a href="https://github.com/kulshekhar/ts-jest/issues/2368">#2368</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/f3522d898cf8d7e67ce73f4dd743e860a14173d6"><code>f3522d8</code></a> chore(release): 26.5.4</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/1dc731a5faf7cda59db1cc642eb99fae973b1246"><code>1dc731a</code></a> fix(compiler): initialize compiler with <code>.ts</code>/<code>.tsx</code>/<code>.d.ts</code> files only (<a href="https://github.com/kulshekhar/ts-jest/issues/2457">#2457</a>)</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/ee10b673d0f76ac97453ecc9799ab460fa0ac79a"><code>ee10b67</code></a> chore(release): 26.5.3</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/174fb74ae68a849391a401363e1f402ef86c2d45"><code>174fb74</code></a> refactor(config): expose root logger constant (<a href="https://github.com/kulshekhar/ts-jest/issues/2422">#2422</a>)</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/0fb6b45e7dc3dd7588d27f09ac9a8849dff470cb"><code>0fb6b45</code></a> fix(config): create fallback jest config when jest config is undefined (<a href="https://github.com/kulshekhar/ts-jest/issues/2421">#2421</a>)</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/060302ed1eb8708df0acd7ab1d613ff06fc08cf3"><code>060302e</code></a> fix: remove <code>@types/jest</code> from direct dep (<a href="https://github.com/kulshekhar/ts-jest/issues/2416">#2416</a>)</li>
<li><a href="https://github.com/kulshekhar/ts-jest/commit/cfba8f423dd59536d8b1e1374ef2b20bff2ed857"><code>cfba8f4</code></a> fix(compiler): return original file content on emit skip (<a href="https://github.com/kulshekhar/ts-jest/issues/2408">#2408</a>)</li>
<li>See full diff in <a href="https://github.com/kulshekhar/ts-jest/compare/v26.5.2...v26.5.4">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ts-jest&package-manager=npm_and_yarn&previous-version=26.5.2&new-version=26.5.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@bors @dependabot
bors[bot] and dependabot[bot] authored Mar 17, 2021
2 parents cc00b5e + ecd0001 commit 94b7374
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"tail": "^2.2.0",
"temp-write": "^4.0.0",
"tmp": "^0.2.1",
"ts-jest": "^26.5.2",
"ts-jest": "^26.5.4",
"ts-node": "^9.1.1",
"tslint": "^6.1.3",
"tslint-no-unused-expression-chai": "^0.1.4",
Expand Down
11 changes: 5 additions & 6 deletions tests/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@
dependencies:
"@types/istanbul-lib-report" "*"

"@types/jest@26.x", "@types/jest@^26.0.20":
"@types/jest@^26.0.20":
version "26.0.20"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
Expand Down Expand Up @@ -5430,12 +5430,11 @@ trim-repeated@^1.0.0:
dependencies:
escape-string-regexp "^1.0.2"

ts-jest@^26.5.2:
version "26.5.2"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.2.tgz#5281d6b44c2f94f71205728a389edc3d7995b0c4"
integrity sha512-bwyJ2zJieSugf7RB+o8fgkMeoMVMM2KPDE0UklRLuACxjwJsOrZNo6chrcScmK33YavPSwhARffy8dZx5LJdUQ==
ts-jest@^26.5.4:
version "26.5.4"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686"
integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==
dependencies:
"@types/jest" "26.x"
bs-logger "0.x"
buffer-from "1.x"
fast-json-stable-stringify "2.x"
Expand Down

0 comments on commit 94b7374

Please sign in to comment.