Skip to content

[pull] master from monkeytypegame:master#913

Merged
pull[bot] merged 13 commits into
Uncodedtech:masterfrom
monkeytypegame:master
Jun 12, 2026
Merged

[pull] master from monkeytypegame:master#913
pull[bot] merged 13 commits into
Uncodedtech:masterfrom
monkeytypegame:master

Conversation

@pull

@pull pull Bot commented Jun 12, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Miodec and others added 13 commits June 12, 2026 17:37
Co-authored-by: Miodec <jack@monkeytype.com>
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from
3.4.0 to 3.6.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dcastil/tailwind-merge/releases">tailwind-merge's
releases</a>.</em></p>
<blockquote>
<h2>v3.6.0</h2>
<h3>New Features</h3>
<ul>
<li>Add support for Tailwind CSS v4.3 by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/677">dcastil/tailwind-merge#677</a>
<ul>
<li>Add <code>postfixLookupClassGroups</code> option to config to
support Tailwind utilities where a slash is part of the full class name,
like named container queries</li>
</ul>
</li>
<li>Add support for readonly array values by <a
href="https://github.com/unional"><code>@​unional</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/652">dcastil/tailwind-merge#652</a></li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Fix broken links in README by <a
href="https://github.com/maurer2"><code>@​maurer2</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/662">dcastil/tailwind-merge#662</a></li>
</ul>
<h3>Other</h3>
<ul>
<li>Harden internal CI pipeline security by omitting git checkout by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a>, suggested
by <a
href="https://github.com/kyletaylored"><code>@​kyletaylored</code></a>
in <a
href="https://github.com/dcastil/tailwind-merge/commit/6b2499c10cf52bed42426d30b4219e90374b30d6">https://github.com/dcastil/tailwind-merge/commit/6b2499c10cf52bed42426d30b4219e90374b30d6</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.5.0...v3.6.0">https://github.com/dcastil/tailwind-merge/compare/v3.5.0...v3.6.0</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, a private
sponsor, <a href="https://github.com/block"><code>@​block</code></a>, <a
href="https://github.com/openclaw"><code>@​openclaw</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a>, <a
href="https://github.com/mike-healy"><code>@​mike-healy</code></a> and
more via <a href="https://github.com/thnxdev"><code>@​thnxdev</code></a>
for sponsoring tailwind-merge! ❤️</p>
<h2>v3.5.0</h2>
<h3>New Features</h3>
<ul>
<li>Add support for Tailwind CSS v4.2 by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/651">dcastil/tailwind-merge#651</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.4.1...v3.5.0">https://github.com/dcastil/tailwind-merge/compare/v3.4.1...v3.5.0</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, a private
sponsor, <a href="https://github.com/block"><code>@​block</code></a>, <a
href="https://github.com/openclaw"><code>@​openclaw</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a> and
more via <a href="https://github.com/thnxdev"><code>@​thnxdev</code></a>
for sponsoring tailwind-merge! ❤️</p>
<h2>v3.4.1</h2>
<h3>Bug Fixes</h3>
<ul>
<li>Prevent arbitrary font-family and font-weight from merging by <a
href="https://github.com/roneymoon"><code>@​roneymoon</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/635">dcastil/tailwind-merge#635</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.4.0...v3.4.1">https://github.com/dcastil/tailwind-merge/compare/v3.4.0...v3.4.1</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, a private
sponsor, <a href="https://github.com/block"><code>@​block</code></a>, <a
href="https://github.com/openclaw"><code>@​openclaw</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a> and
more via <a href="https://github.com/thnxdev"><code>@​thnxdev</code></a>
for sponsoring tailwind-merge! ❤️</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/d54f7e5713c653d0171971405344f7c6e44d418f"><code>d54f7e5</code></a>
v3.6.0</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/638871a67a0a124ac9275eda77cd08b03f2f045e"><code>638871a</code></a>
Update README to add info about Tailwind CSS v4.3 support</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/39fc7b5e915493e5eb3ddb1ca615f5b2eeff2540"><code>39fc7b5</code></a>
Revert &quot;v3.6.0&quot;</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/bd8390f6ca387f93c9e989fb3fb09924fb843445"><code>bd8390f</code></a>
v3.6.0</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/802877c6e31f9fb64c627e5e760729a16cd0a69b"><code>802877c</code></a>
add v3.6.0 changelog</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/a35fedac7d1fc8756223da94290a83a32068d2ae"><code>a35feda</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/665">#665</a>
from dcastil/renovate/rollup-plugin-babel-7.x</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/940389cf89ed0da277ff5c01b98fd619687926e9"><code>940389c</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/667">#667</a>
from dcastil/renovate/release-drafter-release-drafter...</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/005af6df08cfbe2adac7ca6cb5a7be02b9261fbd"><code>005af6d</code></a>
pin to specific version</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/5816ced627ebcaefd497ad8e4202baf750dd545c"><code>5816ced</code></a>
implement breaking changes</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/17041e17c5b9c96fcb0f4758c718799cb3af14a6"><code>17041e1</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/676">#676</a>
from dcastil/dependabot/npm_and_yarn/babel/plugin-tra...</li>
<li>Additional commits viewable in <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.4.0...v3.6.0">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) and
[@types/nodemailer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/nodemailer).
These dependencies needed to be updated together.
Updates `nodemailer` from 8.0.10 to 8.0.11
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/nodemailer/nodemailer/releases">nodemailer's
releases</a>.</em></p>
<blockquote>
<h2>v8.0.11</h2>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.10...v8.0.11">8.0.11</a>
(2026-06-10)</h2>
<h3>Bug Fixes</h3>
<ul>
<li>apply the transport-level newline option in stream and sendmail
transports (<a
href="https://github.com/nodemailer/nodemailer/commit/cb4f904a53d2c2feeaf327203c92378d46304398">cb4f904</a>)</li>
<li>include icalEvent path/href content in the application/ics
attachment (<a
href="https://github.com/nodemailer/nodemailer/commit/b801c48fab8e9b71bc7e0ea1fb32ce6b34675b15">b801c48</a>)</li>
<li>parse Ethereal response props without polynomial regex backtracking
(<a
href="https://github.com/nodemailer/nodemailer/commit/067aebec83b8cbe7682905e89b30ab19d260b503">067aebe</a>)</li>
<li>resolve oauth2_provision_cb at send time for non-pooled SMTP
transports (<a
href="https://github.com/nodemailer/nodemailer/commit/203c8ecf97594ac2e69919b0f3ba966c0f86750e">203c8ec</a>)</li>
<li>return the promise from every resolveContent branch (<a
href="https://github.com/nodemailer/nodemailer/commit/07ffe8cfd97f0486b8c7b541f398922ddab47882">07ffe8c</a>)</li>
<li>strip the url scheme from List-ID header values (<a
href="https://github.com/nodemailer/nodemailer/commit/77e5885cfa0c6723ea7749c1ee74b1c11aeb78bd">77e5885</a>)</li>
<li>tag AWS SES transport errors with the ESES code (<a
href="https://github.com/nodemailer/nodemailer/commit/efa647a125dd698413a7cf6813b8e36881a06f91">efa647a</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md">nodemailer's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.10...v8.0.11">8.0.11</a>
(2026-06-10)</h2>
<h3>Bug Fixes</h3>
<ul>
<li>apply the transport-level newline option in stream and sendmail
transports (<a
href="https://github.com/nodemailer/nodemailer/commit/cb4f904a53d2c2feeaf327203c92378d46304398">cb4f904</a>)</li>
<li>include icalEvent path/href content in the application/ics
attachment (<a
href="https://github.com/nodemailer/nodemailer/commit/b801c48fab8e9b71bc7e0ea1fb32ce6b34675b15">b801c48</a>)</li>
<li>parse Ethereal response props without polynomial regex backtracking
(<a
href="https://github.com/nodemailer/nodemailer/commit/067aebec83b8cbe7682905e89b30ab19d260b503">067aebe</a>)</li>
<li>resolve oauth2_provision_cb at send time for non-pooled SMTP
transports (<a
href="https://github.com/nodemailer/nodemailer/commit/203c8ecf97594ac2e69919b0f3ba966c0f86750e">203c8ec</a>)</li>
<li>return the promise from every resolveContent branch (<a
href="https://github.com/nodemailer/nodemailer/commit/07ffe8cfd97f0486b8c7b541f398922ddab47882">07ffe8c</a>)</li>
<li>strip the url scheme from List-ID header values (<a
href="https://github.com/nodemailer/nodemailer/commit/77e5885cfa0c6723ea7749c1ee74b1c11aeb78bd">77e5885</a>)</li>
<li>tag AWS SES transport errors with the ESES code (<a
href="https://github.com/nodemailer/nodemailer/commit/efa647a125dd698413a7cf6813b8e36881a06f91">efa647a</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/e3b1bdab0f8913b031ffd7a0d4e3592da6fd4c01"><code>e3b1bda</code></a>
chore(master): release 8.0.11 (<a
href="https://redirect.github.com/nodemailer/nodemailer/issues/1826">#1826</a>)</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/4358caf1112c547be8292ef9b4f53308f108274d"><code>4358caf</code></a>
refactor: remove dead checks flagged by Code Quality analysis</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/cf5195cfa25dda6177c265dcf03790f5d1d541e1"><code>cf5195c</code></a>
chore: harden workflow token permissions and update GitHub Actions</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/067aebec83b8cbe7682905e89b30ab19d260b503"><code>067aebe</code></a>
fix: parse Ethereal response props without polynomial regex
backtracking</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/0cee4fe1a52813b98a056ea67f87c195960e693c"><code>0cee4fe</code></a>
chore: add CodeQL code scanning workflow</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/cb9da471bf28b4a83e5ea2a773d070ef57f1993c"><code>cb9da47</code></a>
chore: update dev dependencies</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/e0a4928f4b2d2acb2d888a22c8e7490315d9f8cf"><code>e0a4928</code></a>
chore: format CLAUDE.md with prettier</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/8620f2fb6b0f4882a8cef2a29e23de917c6ef413"><code>8620f2f</code></a>
docs: correct stale timeout defaults in SMTPConnection options
JSDoc</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/efa647a125dd698413a7cf6813b8e36881a06f91"><code>efa647a</code></a>
fix: tag AWS SES transport errors with the ESES code</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/07ffe8cfd97f0486b8c7b541f398922ddab47882"><code>07ffe8c</code></a>
fix: return the promise from every resolveContent branch</li>
<li>Additional commits viewable in <a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.10...v8.0.11">compare
view</a></li>
</ul>
</details>
<br />

Updates `@types/nodemailer` from 8.0.0 to 8.0.1
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/nodemailer">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack <jack@monkeytype.com>
….0.4 (#8096)

Bumps
[@types/chartjs-plugin-trendline](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chartjs-plugin-trendline)
from 1.0.1 to 1.0.4.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chartjs-plugin-trendline">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack <jack@monkeytype.com>
@pull pull Bot locked and limited conversation to collaborators Jun 12, 2026
@pull pull Bot added the ⤵️ pull label Jun 12, 2026
@pull pull Bot merged commit 473e9aa into Uncodedtech:master Jun 12, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants