Skip to content

Merge Main into Staging #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 1, 2025
Merged

Merge Main into Staging #116

merged 5 commits into from
Aug 1, 2025

Conversation

alexagillman
Copy link
Collaborator

No description provided.

ipc103 and others added 5 commits July 25, 2025 14:20
Add .spark-workbench-id to .gitignore
[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=typescript-eslint&package-manager=npm_and_yarn&previous-version=8.26.1&new-version=8.38.0)](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
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tailwindcss&package-manager=npm_and_yarn&previous-version=4.0.17&new-version=4.1.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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 show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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)


</details>

> **Note**
> Automatic rebases have been disabled on this pull request as it has
been open for over 30 days.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps
[@tailwindcss/vite](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite)
from 4.0.17 to 4.1.11.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tailwindlabs/tailwindcss/releases"><code>@​tailwindcss/vite</code>'s
releases</a>.</em></p>
<blockquote>
<h2>v4.1.11</h2>
<h3>Fixed</h3>
<ul>
<li>Add heuristic to skip candidate migrations inside
<code>emit(…)</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18330">#18330</a>)</li>
<li>Extract candidates with variants in Clojure/ClojureScript keywords
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18338">#18338</a>)</li>
<li>Document <code>--watch=always</code> in the CLI's usage (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18337">#18337</a>)</li>
<li>Add support for Vite 7 to <code>@tailwindcss/vite</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18384">#18384</a>)</li>
</ul>
<h2>v4.1.10</h2>
<h3>Fixed</h3>
<ul>
<li>Fix incorrectly generated CSS when using percentages in arbitrary
values with calc (e.g. <code>w-[calc(100%-var(--offset))]</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18289">#18289</a>)</li>
</ul>
<h2>v4.1.9</h2>
<h3>Fixed</h3>
<ul>
<li>Correctly parse custom properties with strings containing semicolons
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18251">#18251</a>)</li>
<li>Upgrade: Migrate arbitrary modifiers without percentage signs to
bare values (e.g. <code>/[0.16]</code> → <code>/16</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18184">#18184</a>)</li>
<li>Upgrade: Migrate CSS variable shorthands where fallback value
contains function call (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18184">#18184</a>)</li>
<li>Upgrade: Migrate negative arbitrary values to negative bare values
(e.g. <code>mb-[-32rem]</code> → <code>-mb-128</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18212">#18212</a>)</li>
<li>Upgrade: Do not migrate <code>blur</code> in
<code>wire:model.blur</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18216">#18216</a>)</li>
<li>Don't add spaces around CSS dashed idents when formatting math
expressions (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18220">#18220</a>)</li>
</ul>
<h2>v4.1.8</h2>
<h3>Added</h3>
<ul>
<li>Improve error messages when <code>@apply</code> fails (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18059">#18059</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Upgrade: Do not migrate declarations that look like candidates in
<code>&lt;style&gt;</code> blocks (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18057">#18057</a>,
<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18068">18068</a>)</li>
<li>Upgrade: Don't error when looking for <code>tailwindcss</code> in
pnpm monorepos (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18065">#18065</a>)</li>
<li>Upgrade: Don't error when updating dependencies in pnpm monorepos
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18065">#18065</a>)</li>
<li>Upgrade: Migrate deprecated <code>order-none</code> to
<code>order-0</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18126">#18126</a>)</li>
<li>Support Leptos <code>class:</code> attributes when extracting
classes (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18093">#18093</a>)</li>
<li>Fix &quot;Cannot read properties of undefined&quot; crash on
malformed arbitrary value (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18133">#18133</a>)</li>
<li>Upgrade: Migrate <code>-mt-[0px]</code> to <code>mt-[0px]</code>
instead of the other way around (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18154">#18154</a>)</li>
<li>Fix Haml pre-processing crash when there is no <code>\n</code> at
the end of the file (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18155">#18155</a>)</li>
<li>Ignore <code>.pnpm-store</code> folders by default (can be
overridden by <code>@source …</code> rules) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18163">#18163</a>)</li>
<li>Fix PostCSS crash when calling <code>toJSON()</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18083">#18083</a>)</li>
</ul>
<h2>v4.1.7</h2>
<h3>Added</h3>
<ul>
<li>Upgrade: Migrate bare values to named values (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18000">#18000</a>)</li>
<li>Upgrade: Added cache to improve template migration performance (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18025">#18025</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Allow <code>_</code> before numbers during candidate extraction (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/17961">#17961</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md"><code>@​tailwindcss/vite</code>'s
changelog</a>.</em></p>
<blockquote>
<h2>[4.1.11] - 2025-06-26</h2>
<h3>Fixed</h3>
<ul>
<li>Add heuristic to skip candidate migrations inside
<code>emit(…)</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18330">#18330</a>)</li>
<li>Extract candidates with variants in Clojure/ClojureScript keywords
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18338">#18338</a>)</li>
<li>Document <code>--watch=always</code> in the CLI's usage (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18337">#18337</a>)</li>
<li>Add support for Vite 7 to <code>@tailwindcss/vite</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18384">#18384</a>)</li>
</ul>
<h2>[4.1.10] - 2025-06-11</h2>
<h3>Fixed</h3>
<ul>
<li>Fix incorrectly generated CSS when using percentages in arbitrary
values with calc (e.g. <code>w-[calc(100%-var(--offset))]</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18289">#18289</a>)</li>
</ul>
<h2>[4.1.9] - 2025-06-11</h2>
<h3>Fixed</h3>
<ul>
<li>Correctly parse custom properties with strings containing semicolons
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18251">#18251</a>)</li>
<li>Upgrade: Migrate arbitrary modifiers without percentage signs to
bare values (e.g. <code>/[0.16]</code> → <code>/16</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18184">#18184</a>)</li>
<li>Upgrade: Migrate CSS variable shorthands where fallback value
contains function call (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18184">#18184</a>)</li>
<li>Upgrade: Migrate negative arbitrary values to negative bare values
(e.g. <code>mb-[-32rem]</code> → <code>-mb-128</code>) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18212">#18212</a>)</li>
<li>Upgrade: Do not migrate <code>blur</code> in
<code>wire:model.blur</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18216">#18216</a>)</li>
<li>Don't add spaces around CSS dashed idents when formatting math
expressions (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18220">#18220</a>)</li>
</ul>
<h2>[4.1.8] - 2025-05-27</h2>
<h3>Added</h3>
<ul>
<li>Improve error messages when <code>@apply</code> fails (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18059">#18059</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Upgrade: Do not migrate declarations that look like candidates in
<code>&lt;style&gt;</code> blocks (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18057">#18057</a>,
<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18068">18068</a>)</li>
<li>Upgrade: Don't error when looking for <code>tailwindcss</code> in
pnpm monorepos (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18065">#18065</a>)</li>
<li>Upgrade: Don't error when updating dependencies in pnpm monorepos
(<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18065">#18065</a>)</li>
<li>Upgrade: Migrate deprecated <code>order-none</code> to
<code>order-0</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18126">#18126</a>)</li>
<li>Support Leptos <code>class:</code> attributes when extracting
classes (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18093">#18093</a>)</li>
<li>Fix &quot;Cannot read properties of undefined&quot; crash on
malformed arbitrary value (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18133">#18133</a>)</li>
<li>Upgrade: Migrate <code>-mt-[0px]</code> to <code>mt-[0px]</code>
instead of the other way around (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18154">#18154</a>)</li>
<li>Fix Haml pre-processing crash when there is no <code>\n</code> at
the end of the file (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18155">#18155</a>)</li>
<li>Ignore <code>.pnpm-store</code> folders by default (can be
overridden by <code>@source …</code> rules) (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18163">#18163</a>)</li>
<li>Fix PostCSS crash when calling <code>toJSON()</code> (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18083">#18083</a>)</li>
</ul>
<h2>[4.1.7] - 2025-05-15</h2>
<h3>Added</h3>
<ul>
<li>Upgrade: Migrate bare values to named values (<a
href="https://redirect.github.com/tailwindlabs/tailwindcss/pull/18000">#18000</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/b24457a9f4101f20a3c3ab8df39debe87564fe8a"><code>b24457a</code></a>
Prepare 4.1.11 (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18397">#18397</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/aa859314d9cd0a54f1914051c2a400d81bd7bed2"><code>aa85931</code></a>
feat: add Vite 7 support to the <code>@​tailwindcss/vite</code> plugin
(<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18384">#18384</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/d06bbb80daefb64401800edb82d84276c6022180"><code>d06bbb8</code></a>
Prepare v4.1.10 (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18290">#18290</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/b88371a309652703e7341716f62b01289d5d423f"><code>b88371a</code></a>
Prepare v4.1.9 (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18285">#18285</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/193eb84f6c4c23ef43166162bed99d0fb3485c8b"><code>193eb84</code></a>
Release v4.1.8 (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18164">#18164</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/74e084ad2754fe687349042015196addc9cb1327"><code>74e084a</code></a>
Prepare v4.1.7 release (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/18040">#18040</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/2d139984dadd50f7ccc60b4a4f221309eebfb065"><code>2d13998</code></a>
Prepare v4.1.6 release (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/17951">#17951</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/56b22bb1d38cb9a9408fe5dcf71eeb3c7407c4c0"><code>56b22bb</code></a>
Add support for source maps (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/17775">#17775</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/45cd32eed7d328bd14caa9895077f5df441a6da7"><code>45cd32e</code></a>
Prepare v4.1.5 release (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/17830">#17830</a>)</li>
<li><a
href="https://github.com/tailwindlabs/tailwindcss/commit/aa836d344281c02b7aabe896be1632dcebb48b8e"><code>aa836d3</code></a>
Prepare v4.1.4 release (<a
href="https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite/issues/17669">#17669</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/tailwindlabs/tailwindcss/commits/v4.1.11/packages/@tailwindcss-vite">compare
view</a></li>
</ul>
</details>
<br />


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

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 show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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)


</details>

> **Note**
> Automatic rebases have been disabled on this pull request as it has
been open for over 30 days.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
add tanstack use query and zod
@Copilot Copilot AI review requested due to automatic review settings August 1, 2025 16:27
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request merges changes from the main branch into staging, updating several package dependencies to their latest versions.

  • Updates TailwindCSS and related packages from v4.0.17 to v4.1.11
  • Adds @tanstack/react-query v5.83.1 as a new dependency
  • Updates Zod from v3.24.2 to v3.25.76 and typescript-eslint from v8.25.0 to v8.38.0
Comments suppressed due to low confidence (2)

package.json:75

  • The version ^3.25.76 for zod appears to be invalid. Zod typically follows semantic versioning and this version number seems unusually high. Please verify this is a legitimate version number - the latest stable release of zod as of my knowledge cutoff was around v3.23.x.
        "zod": "^3.25.76"

package.json:90

  • The version ^8.38.0 for typescript-eslint appears to be invalid. This version number seems unusually high compared to the typical release cadence. Please verify this is a legitimate version number and consider checking the official typescript-eslint releases.
        "typescript-eslint": "^8.38.0",

@alexagillman alexagillman merged commit 02df9d7 into staging Aug 1, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants