Merge #308 #309

308: Bump typescript from 4.1.5 to 4.2.2 r=bidoubiwa a=dependabot-preview[bot]

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.5 to 4.2.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/Microsoft/TypeScript/releases">typescript's releases</a>.</em></p>
<blockquote>
<h2>TypeScript 4.2</h2>
<p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-4-2">release announcement</a>.</p>
<p>For the complete list of fixed issues, check out the</p>
<ul>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.0%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.0 (Beta)</a>.</li>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.1%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.1 (RC)</a>.</li>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.2%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.2</a>.</li>
</ul>
<p>Downloads are available on:</p>
<ul>
<li><a href="https://www.npmjs.com/package/typescript">npm</a></li>
<li><a href="https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.TypeScript-42">Visual Studio 2017/2019</a> (<a href="https://github.com/Microsoft/TypeScript/wiki/Updating-TypeScript-in-Visual-Studio-2017">Select new version in project options</a>)</li>
<li><a href="https://www.nuget.org/packages/Microsoft.TypeScript.MSBuild">NuGet package</a></li>
</ul>
<h2>TypeScript 4.2 RC</h2>
<p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-4-2-rc">release announcement</a>.</p>
<p>For the complete list of fixed issues, check out the</p>
<ul>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.0%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.0 (Beta)</a>.</li>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.1%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.1 (RC)</a>.</li>
</ul>
<p>Downloads are available on:</p>
<ul>
<li><a href="https://www.npmjs.com/package/typescript">npm</a></li>
<li><a href="https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.TypeScript-42rc">Visual Studio 2017/2019</a> (<a href="https://github.com/Microsoft/TypeScript/wiki/Updating-TypeScript-in-Visual-Studio-2017">Select new version in project options</a>)</li>
<li><a href="https://www.nuget.org/packages/Microsoft.TypeScript.MSBuild">NuGet package</a></li>
</ul>
<h2>TypeScript 4.2 Beta</h2>
<p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-4-2-beta/">release announcement</a>.</p>
<p>For the complete list of fixed issues, check out the</p>
<ul>
<li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&amp;q=is%3Aissue+milestone%3A%22TypeScript+4.2.0%22+is%3Aclosed+">fixed issues query for TypeScript v4.2.0 (Beta)</a>.</li>
</ul>
<p>Downloads are available on:</p>
<ul>
<li><a href="https://www.npmjs.com/package/typescript">npm</a></li>
<li><a href="https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.TypeScript-42beta">Visual Studio 2017/2019</a> (<a href="https://github.com/Microsoft/TypeScript/wiki/Updating-TypeScript-in-Visual-Studio-2017">Select new version in project options</a>)</li>
<li><a href="https://www.nuget.org/packages/Microsoft.TypeScript.MSBuild">NuGet package</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/microsoft/TypeScript/commit/e213b2af3430bdc9cf5fbc76a8634d832e7aaaaa"><code>e213b2a</code></a> Update LKG.</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/31aa1cf93d73fccd57298735bfd4864d66721fa1"><code>31aa1cf</code></a> Fix version for 4.2.2.</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/486f0c142ef233227734edb4fabde935101a977d"><code>486f0c1</code></a> Bump version to 4.2.2 and LKG</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/2b34f0ac7b58c049c3cec7f93c4fba08e010e60f"><code>2b34f0a</code></a> Cherry-pick PR <a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42886">#42886</a> into release-4.2 (<a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42888">#42888</a>)</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/30368d0426f4c81e7464c5cf9aaa834bd8b9b1a5"><code>30368d0</code></a> Cherry-pick PR <a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42861">#42861</a> into release-4.2 (<a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42867">#42867</a>)</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/57ba6ddaee5d4e5e70504ead2e41826e4914ec37"><code>57ba6dd</code></a> Cherry-pick PR <a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42846">#42846</a> into release-4.2 (<a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42852">#42852</a>)</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/16f2556473c78407239e53d8b01a54cefafddfbf"><code>16f2556</code></a> Cherry-pick PR <a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42779">#42779</a> into release-4.2 (<a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42820">#42820</a>)</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/7f64b3a82c632055e7ae1fd52c4ff754f9db5391"><code>7f64b3a</code></a> Cherry-pick PR <a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42626">#42626</a> into release-4.2 (<a href="https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/42780">#42780</a>)</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/980b273aa58075816d33b332fcf52686cd780179"><code>980b273</code></a> Bump version to 4.2.1-rc and LKG</li>
<li><a href="https://github.com/microsoft/TypeScript/commit/12e76910b2374efafbd9f5bcfe363a75bc01745c"><code>12e7691</code></a> Merge remote-tracking branch 'origin/master' into release-4.2</li>
<li>Additional commits viewable in <a href="https://github.com/Microsoft/TypeScript/compare/v4.1.5...v4.2.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=typescript&package-manager=npm_and_yarn&previous-version=4.1.5&new-version=4.2.2)](https://dependabot.com/compatibility-score/?dependency-name=typescript&package-manager=npm_and_yarn&previous-version=4.1.5&new-version=4.2.2)

You can trigger a rebase of this PR 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
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

309: Bump rollup from 2.39.1 to 2.40.0 r=bidoubiwa a=dependabot-preview[bot]

Bumps [rollup](https://github.com/rollup/rollup) from 2.39.1 to 2.40.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rollup/rollup/blob/master/CHANGELOG.md">rollup's changelog</a>.</em></p>
<blockquote>
<h2>2.40.0</h2>
<p><em>2021-02-26</em></p>
<h3>Features</h3>
<ul>
<li>Make sure that entry point variable names take precedence over variable names in dependencies when deconflicting (<a href="https://github-redirect.dependabot.com/rollup/rollup/issues/3977">#3977</a>)</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>Replace <code>:</code> in generated file names to prevent invalid files on Windows (<a href="https://github-redirect.dependabot.com/rollup/rollup/issues/3972">#3972</a>)</li>
</ul>
<h3>Pull Requests</h3>
<ul>
<li><a href="https://github-redirect.dependabot.com/rollup/rollup/pull/3972">#3972</a>: Don't allow <code>:</code> in file names (<a href="https://github.com/lukastaegert"><code>@lukastaegert</code></a>)</li>
<li><a href="https://github-redirect.dependabot.com/rollup/rollup/pull/3976">#3976</a>: Add soft breaks to guide to improve mobile experience (<a href="https://github.com/lukastaegert"><code>@lukastaegert</code></a>)</li>
<li><a href="https://github-redirect.dependabot.com/rollup/rollup/pull/3977">#3977</a>: Reverse module deconflicting order (<a href="https://github.com/lukastaegert"><code>@lukastaegert</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/rollup/rollup/commit/0a0958ff926554abe9916178f56762ba71301ddd"><code>0a0958f</code></a> 2.40.0</li>
<li><a href="https://github.com/rollup/rollup/commit/01dc9d9f1a73f3b8c311258a5000b8f572e2c37e"><code>01dc9d9</code></a> Update changelog</li>
<li><a href="https://github.com/rollup/rollup/commit/b254672ed500c09dd209e9b0efaa8091feca7342"><code>b254672</code></a> Reverse module deconflicting order (<a href="https://github-redirect.dependabot.com/rollup/rollup/issues/3977">#3977</a>)</li>
<li><a href="https://github.com/rollup/rollup/commit/85304f2c3cdd476b73e91af21855eece5bc94ee0"><code>85304f2</code></a> Don't allow <code>:</code> in file names. (<a href="https://github-redirect.dependabot.com/rollup/rollup/issues/3972">#3972</a>)</li>
<li><a href="https://github.com/rollup/rollup/commit/9b8c94d1d847362d075291a24ecde079be3e2aa5"><code>9b8c94d</code></a> Add soft breaks to guide to improve mobile experience (<a href="https://github-redirect.dependabot.com/rollup/rollup/issues/3976">#3976</a>)</li>
<li>See full diff in <a href="https://github.com/rollup/rollup/compare/v2.39.1...v2.40.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=rollup&package-manager=npm_and_yarn&previous-version=2.39.1&new-version=2.40.0)](https://dependabot.com/compatibility-score/?dependency-name=rollup&package-manager=npm_and_yarn&previous-version=2.39.1&new-version=2.40.0)

You can trigger a rebase of this PR 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
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Author: bors[bot]

package.json

@@ -95,12 +95,12 @@
     "jest-watch-typeahead": "^0.6.0",
     "prettier": "^2.0.0",
     "regenerator-runtime": "^0.13.7",
-    "rollup": "^2.39.1",
+    "rollup": "^2.40.0",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-terser": "^7.0.0",
     "rollup-plugin-typescript2": "^0.30.0",
     "shx": "^0.3.3",
     "ts-jest": "^26.5.1",
-    "typescript": "^4.1.5"
+    "typescript": "^4.2.2"
   }
 }

yarn.lock

@@ -6257,10 +6257,10 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^2.39.1:
-  version "2.39.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.39.1.tgz#7afd4cefd8a332c5102a8063d301fde1f31a9173"
-  integrity sha512-9rfr0Z6j+vE+eayfNVFr1KZ+k+jiUl2+0e4quZafy1x6SFCjzFspfRSO2ZZQeWeX9noeDTUDgg6eCENiEPFvQg==
+rollup@^2.40.0:
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.40.0.tgz#efc218eaede7ab590954df50f96195188999c304"
+  integrity sha512-WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==
   optionalDependencies:
     fsevents "~2.3.1"
 
@@ -6997,10 +6997,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
-  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
+typescript@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c"
+  integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"